Author: rsmith
Date: Fri Sep 30 18:47:58 2016
New Revision: 282984
URL: http://llvm.org/viewvc/llvm-project?rev=282984&view=rev
Log:
Fix tests to not assume they know exactly what will be in Clang's predefines
buffer.
Modified:
clang-tools-extra/trunk/test/pp-trace/pp-trace-conditional.cpp
clang-tools-extra/trunk/test/pp-trace/pp-trace-include.cpp
clang-tools-extra/trunk/test/pp-trace/pp-trace-macro.cpp
Modified: clang-tools-extra/trunk/test/pp-trace/pp-trace-conditional.cpp
URL:
http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/pp-trace/pp-trace-conditional.cpp?rev=282984&r1=282983&r2=282984&view=diff
==============================================================================
--- clang-tools-extra/trunk/test/pp-trace/pp-trace-conditional.cpp (original)
+++ clang-tools-extra/trunk/test/pp-trace/pp-trace-conditional.cpp Fri Sep 30
18:47:58 2016
@@ -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
Modified: clang-tools-extra/trunk/test/pp-trace/pp-trace-include.cpp
URL:
http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/pp-trace/pp-trace-include.cpp?rev=282984&r1=282983&r2=282984&view=diff
==============================================================================
--- clang-tools-extra/trunk/test/pp-trace/pp-trace-include.cpp (original)
+++ clang-tools-extra/trunk/test/pp-trace/pp-trace-include.cpp Fri Sep 30
18:47:58 2016
@@ -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
Modified: clang-tools-extra/trunk/test/pp-trace/pp-trace-macro.cpp
URL:
http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/pp-trace/pp-trace-macro.cpp?rev=282984&r1=282983&r2=282984&view=diff
==============================================================================
--- clang-tools-extra/trunk/test/pp-trace/pp-trace-macro.cpp (original)
+++ clang-tools-extra/trunk/test/pp-trace/pp-trace-macro.cpp Fri Sep 30
18:47:58 2016
@@ -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
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
