Fix YAML tests again.

llvm-svn: 190489

diff --git a/clang-tools-extra/test/clang-apply-replacements/Inputs/basic/file1.yaml b/clang-tools-extra/test/clang-apply-replacements/Inputs/basic/file1.yaml
index 3b67305..77eac52 100644 (file)
--- a/clang-tools-extra/test/clang-apply-replacements/Inputs/basic/file1.yaml
+++ b/clang-tools-extra/test/clang-apply-replacements/Inputs/basic/file1.yaml
@@ -1,15 +1,15 @@
 ---
 MainSourceFile:     source1.cpp
 Replacements:
-  - FilePath:        '$(path)/basic.h'
+  - FilePath:        $(path)/basic.h
     Offset:          242
     Length:          26
     ReplacementText: 'auto & elem : ints'
-  - FilePath:        '$(path)/basic.h'
+  - FilePath:        $(path)/basic.h
     Offset:          276
     Length:          22
     ReplacementText: ''
-  - FilePath:        '$(path)/basic.h'
+  - FilePath:        $(path)/basic.h
     Offset:          298
     Length:          1
     ReplacementText: elem

diff --git a/clang-tools-extra/test/clang-apply-replacements/Inputs/basic/file2.yaml b/clang-tools-extra/test/clang-apply-replacements/Inputs/basic/file2.yaml
index 78ddab4..9a7a156 100644 (file)
--- a/clang-tools-extra/test/clang-apply-replacements/Inputs/basic/file2.yaml
+++ b/clang-tools-extra/test/clang-apply-replacements/Inputs/basic/file2.yaml
@@ -1,8 +1,8 @@
 ---
-MainSourceFile:     "source2.cpp"
+MainSourceFile:     source2.cpp
 Replacements:
-  - FilePath:        "$(path)/basic.h"
+  - FilePath:        $(path)/basic.h
     Offset:          148
     Length:          0
-    ReplacementText: "override "
+    ReplacementText: 'override '
 ...

diff --git a/clang-tools-extra/test/clang-apply-replacements/Inputs/conflict/file1.yaml b/clang-tools-extra/test/clang-apply-replacements/Inputs/conflict/file1.yaml
index 1bb0a2a..5d962cd 100644 (file)
--- a/clang-tools-extra/test/clang-apply-replacements/Inputs/conflict/file1.yaml
+++ b/clang-tools-extra/test/clang-apply-replacements/Inputs/conflict/file1.yaml
@@ -1,16 +1,16 @@
 ---
-MainSourceFile: "source1.cpp"
+MainSourceFile: source1.cpp
 Replacements:
-  - FilePath:        "$(path)/common.h"
+  - FilePath:        $(path)/common.h
     Offset:          106
     Length:          26
-    ReplacementText: "auto & i : ints"
-  - FilePath:        "$(path)/common.h"
+    ReplacementText: 'auto & i : ints'
+  - FilePath:        $(path)/common.h
     Offset:          140
     Length:          7
-    ReplacementText: "i"
-  - FilePath:        "$(path)/common.h"
+    ReplacementText: i
+  - FilePath:        $(path)/common.h
     Offset:          160
     Length:          12
-    ReplacementText: ""
+    ReplacementText: ''
 ...

diff --git a/clang-tools-extra/test/clang-apply-replacements/Inputs/conflict/file2.yaml b/clang-tools-extra/test/clang-apply-replacements/Inputs/conflict/file2.yaml
index 171a4e0..d8877f7 100644 (file)
--- a/clang-tools-extra/test/clang-apply-replacements/Inputs/conflict/file2.yaml
+++ b/clang-tools-extra/test/clang-apply-replacements/Inputs/conflict/file2.yaml
@@ -1,15 +1,15 @@
 ---
 MainSourceFile: source2.cpp
 Replacements:
-  - FilePath:        '$(path)/common.h'
+  - FilePath:        $(path)/common.h
     Offset:          106
     Length:          26
     ReplacementText: 'int & elem : ints'
-  - FilePath:        '$(path)/common.h'
+  - FilePath:        $(path)/common.h
     Offset:          140
     Length:          7
     ReplacementText: elem
-  - FilePath:        '$(path)/common.h'
+  - FilePath:        $(path)/common.h
     Offset:          169
     Length:          1
     ReplacementText: nullptr

diff --git a/clang-tools-extra/test/clang-apply-replacements/Inputs/conflict/file3.yaml b/clang-tools-extra/test/clang-apply-replacements/Inputs/conflict/file3.yaml
index 59e71eb..0ce57b6 100644 (file)
--- a/clang-tools-extra/test/clang-apply-replacements/Inputs/conflict/file3.yaml
+++ b/clang-tools-extra/test/clang-apply-replacements/Inputs/conflict/file3.yaml
@@ -1,7 +1,7 @@
 ---
-MainSourceFile: "source1.cpp"
+MainSourceFile: source1.cpp
 Replacements:
-  - FilePath:        "$(path)/common.h"
+  - FilePath:        $(path)/common.h
     Offset:          169
     Length:          0
     ReplacementText: "(int*)"

diff --git a/clang-tools-extra/test/clang-modernize/HeaderReplacements/common_expected.yaml b/clang-tools-extra/test/clang-modernize/HeaderReplacements/common_expected.yaml
index 08ff5ae..fbacb47 100644 (file)
--- a/clang-tools-extra/test/clang-modernize/HeaderReplacements/common_expected.yaml
+++ b/clang-tools-extra/test/clang-modernize/HeaderReplacements/common_expected.yaml
@@ -1,19 +1,19 @@
 ---
-MainSourceFile:  '$(path)/common.cpp'
+MainSourceFile:  $(path)/common.cpp
 Replacements:    
-  - FilePath:        '$(path)/common.h'
+  - FilePath:        $(path)/common.h
     Offset:          506
     Length:          2
     ReplacementText: elem
-  - FilePath:        '$(path)/common.h'
+  - FilePath:        $(path)/common.h
     Offset:          432
     Length:          61
     ReplacementText: '(auto & elem : C)'
-  - FilePath:        '$(path)/common.cpp'
+  - FilePath:        $(path)/common.cpp
     Offset:          289
     Length:          2
     ReplacementText: elem
-  - FilePath:        '$(path)/common.cpp'
+  - FilePath:        $(path)/common.cpp
     Offset:          206
     Length:          63
     ReplacementText: '(auto & elem : C1)'

diff --git a/clang-tools-extra/test/clang-modernize/HeaderReplacements/main_expected.yaml b/clang-tools-extra/test/clang-modernize/HeaderReplacements/main_expected.yaml
index 48c919a..0ca29cb 100644 (file)
--- a/clang-tools-extra/test/clang-modernize/HeaderReplacements/main_expected.yaml
+++ b/clang-tools-extra/test/clang-modernize/HeaderReplacements/main_expected.yaml
@@ -1,11 +1,11 @@
 ---
-MainSourceFile:      '$(path)/main.cpp'
+MainSourceFile:      $(path)/main.cpp
 Replacements:
-  - FilePath:        '$(path)/common.h'
+  - FilePath:        $(path)/common.h
     Offset:          506
     Length:          2
     ReplacementText: elem
-  - FilePath:        '$(path)/common.h'
+  - FilePath:        $(path)/common.h
     Offset:          432
     Length:          61
     ReplacementText: '(auto & elem : C)'