Fix tests to not assume they know exactly what will be in Clang's predefines buffer.

llvm-svn: 282984

diff --git a/clang-tools-extra/test/pp-trace/pp-trace-conditional.cpp b/clang-tools-extra/test/pp-trace/pp-trace-conditional.cpp
index c79f4e1..e3e225f 100644 (file)
--- a/clang-tools-extra/test/pp-trace/pp-trace-conditional.cpp
+++ b/clang-tools-extra/test/pp-trace/pp-trace-conditional.cpp
@@ -63,21 +63,21 @@
 
 // CHECK: ---
 // CHECK-NEXT: - Callback: MacroDefined
-// CHECK-NEXT:   MacroNameTok: __STDC__
+// CHECK:        MacroNameTok: __STDC__
 // CHECK-NEXT:   MacroDirective: MD_Define
 // CHECK-NEXT: - Callback: MacroDefined
-// CHECK-NEXT:   MacroNameTok: __STDC_HOSTED__
+// CHECK:        MacroNameTok: __STDC_HOSTED__
 // CHECK-NEXT:   MacroDirective: MD_Define
 // CHECK-NEXT: - Callback: MacroDefined
-// CHECK-NEXT:   MacroNameTok: __cplusplus
+// CHECK:        MacroNameTok: __cplusplus
 // CHECK-NEXT:   MacroDirective: MD_Define
 // CHECK-NEXT: - Callback: MacroDefined
-// CHECK-NEXT:   MacroNameTok: __STDC_UTF_16__
+// CHECK:        MacroNameTok: __STDC_UTF_16__
 // CHECK-NEXT:   MacroDirective: MD_Define
 // CHECK-NEXT: - Callback: MacroDefined
-// CHECK-NEXT:   MacroNameTok: __STDC_UTF_32__
+// CHECK:        MacroNameTok: __STDC_UTF_32__
 // CHECK-NEXT:   MacroDirective: MD_Define
-// CHECK-NEXT: - Callback: If
+// CHECK:      - Callback: If
 // CHECK-NEXT:   Loc: "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:3:2"
 // CHECK-NEXT:   ConditionRange: ["{{.*}}{{[/\\]}}pp-trace-conditional.cpp:3:4", "{{.*}}{{[/\\]}}pp-trace-conditional.cpp:4:1"]
 // CHECK-NEXT:   ConditionValue: CVK_True

diff --git a/clang-tools-extra/test/pp-trace/pp-trace-include.cpp b/clang-tools-extra/test/pp-trace/pp-trace-include.cpp
index 63fa7aa..7d925d8 100644 (file)
--- a/clang-tools-extra/test/pp-trace/pp-trace-include.cpp
+++ b/clang-tools-extra/test/pp-trace/pp-trace-include.cpp
@@ -20,21 +20,21 @@
 // CHECK-NEXT:   FileType: C_System
 // CHECK-NEXT:   PrevFID: (invalid)
 // CHECK-NEXT: - Callback: MacroDefined
-// CHECK-NEXT:   MacroNameTok: __STDC__
+// CHECK:        MacroNameTok: __STDC__
 // CHECK-NEXT:   MacroDirective: MD_Define
 // CHECK-NEXT: - Callback: MacroDefined
-// CHECK-NEXT:   MacroNameTok: __STDC_HOSTED__
+// CHECK:        MacroNameTok: __STDC_HOSTED__
 // CHECK-NEXT:   MacroDirective: MD_Define
 // CHECK-NEXT: - Callback: MacroDefined
-// CHECK-NEXT:   MacroNameTok: __cplusplus
+// CHECK:        MacroNameTok: __cplusplus
 // CHECK-NEXT:   MacroDirective: MD_Define
 // CHECK-NEXT: - Callback: MacroDefined
-// CHECK-NEXT:   MacroNameTok: __STDC_UTF_16__
+// CHECK:        MacroNameTok: __STDC_UTF_16__
 // CHECK-NEXT:   MacroDirective: MD_Define
 // CHECK-NEXT: - Callback: MacroDefined
-// CHECK-NEXT:   MacroNameTok: __STDC_UTF_32__
+// CHECK:        MacroNameTok: __STDC_UTF_32__
 // CHECK-NEXT:   MacroDirective: MD_Define
-// CHECK-NEXT: - Callback: FileChanged
+// CHECK:      - Callback: FileChanged
 // CHECK-NEXT:   Loc: "<command line>:1:1"
 // CHECK-NEXT:   Reason: EnterFile
 // CHECK-NEXT:   FileType: C_User

diff --git a/clang-tools-extra/test/pp-trace/pp-trace-macro.cpp b/clang-tools-extra/test/pp-trace/pp-trace-macro.cpp
index 45ea223..85e2088 100644 (file)
--- a/clang-tools-extra/test/pp-trace/pp-trace-macro.cpp
+++ b/clang-tools-extra/test/pp-trace/pp-trace-macro.cpp
@@ -16,21 +16,21 @@ X
 
 // CHECK: ---
 // CHECK-NEXT: - Callback: MacroDefined
-// CHECK-NEXT:   MacroNameTok: __STDC__
+// CHECK:        MacroNameTok: __STDC__
 // CHECK-NEXT:   MacroDirective: MD_Define
 // CHECK-NEXT: - Callback: MacroDefined
-// CHECK-NEXT:   MacroNameTok: __STDC_HOSTED__
+// CHECK:        MacroNameTok: __STDC_HOSTED__
 // CHECK-NEXT:   MacroDirective: MD_Define
 // CHECK-NEXT: - Callback: MacroDefined
-// CHECK-NEXT:   MacroNameTok: __cplusplus
+// CHECK:        MacroNameTok: __cplusplus
 // CHECK-NEXT:   MacroDirective: MD_Define
 // CHECK-NEXT: - Callback: MacroDefined
-// CHECK-NEXT:   MacroNameTok: __STDC_UTF_16__
+// CHECK:        MacroNameTok: __STDC_UTF_16__
 // CHECK-NEXT:   MacroDirective: MD_Define
 // CHECK-NEXT: - Callback: MacroDefined
-// CHECK-NEXT:   MacroNameTok: __STDC_UTF_32__
+// CHECK:        MacroNameTok: __STDC_UTF_32__
 // CHECK-NEXT:   MacroDirective: MD_Define
-// CHECK-NEXT: - Callback: MacroDefined
+// CHECK:      - Callback: MacroDefined
 // CHECK-NEXT:   MacroNameTok: MACRO
 // CHECK-NEXT:   MacroDirective: MD_Define
 // CHECK-NEXT: - Callback: MacroExpands