diff options
Diffstat (limited to 'clang-tools-extra')
-rw-r--r-- | clang-tools-extra/pp-trace/PPCallbacksTracker.cpp | 4 | ||||
-rw-r--r-- | clang-tools-extra/test/pp-trace/pp-trace-ident.cpp | 10 | ||||
-rw-r--r-- | clang-tools-extra/test/pp-trace/pp-trace-modules.cpp | 16 |
3 files changed, 20 insertions, 10 deletions
diff --git a/clang-tools-extra/pp-trace/PPCallbacksTracker.cpp b/clang-tools-extra/pp-trace/PPCallbacksTracker.cpp index f5a0c06e37e..654c109a616 100644 --- a/clang-tools-extra/pp-trace/PPCallbacksTracker.cpp +++ b/clang-tools-extra/pp-trace/PPCallbacksTracker.cpp @@ -166,7 +166,7 @@ void PPCallbacksTracker::Ident(clang::SourceLocation Loc, const std::string &Str) { beginCallback("Ident"); appendArgument("Loc", Loc); - appendQuotedArgument("Str", Str); + appendArgument("Str", Str); } // Callback invoked when start reading any pragma directive. @@ -527,7 +527,7 @@ void PPCallbacksTracker::appendArgument(const char *Name, SS << ", "; SS << "{" << "Name: " << Value[I].first->getName() << ", " - << "Loc:" << getSourceLocationString(PP, Value[I].second) << "}"; + << "Loc: " << getSourceLocationString(PP, Value[I].second) << "}"; } SS << "]"; appendArgument(Name, SS.str()); diff --git a/clang-tools-extra/test/pp-trace/pp-trace-ident.cpp b/clang-tools-extra/test/pp-trace/pp-trace-ident.cpp new file mode 100644 index 00000000000..9981c39e60e --- /dev/null +++ b/clang-tools-extra/test/pp-trace/pp-trace-ident.cpp @@ -0,0 +1,10 @@ +// RUN: pp-trace -ignore FileChanged,MacroDefined %s -undef -target x86_64 -std=c++11 | FileCheck --strict-whitespace %s + +#ident "$Id$" + +// CHECK: --- +// CHECK-NEXT: - Callback: Ident +// CHECK-NEXT: Loc: "{{.*}}{{[/\\]}}pp-trace-ident.cpp:3:2" +// CHECK-NEXT: Str: "$Id$" +// CHECK-NEXT: - Callback: EndOfMainFile +// CHECK-NEXT: ... diff --git a/clang-tools-extra/test/pp-trace/pp-trace-modules.cpp b/clang-tools-extra/test/pp-trace/pp-trace-modules.cpp index 811b33bdd67..d6f1f61fbcd 100644 --- a/clang-tools-extra/test/pp-trace/pp-trace-modules.cpp +++ b/clang-tools-extra/test/pp-trace/pp-trace-modules.cpp @@ -1,11 +1,11 @@ // RUN: pp-trace -ignore FileChanged,MacroDefined %s -x objective-c++ -undef -target x86_64 -std=c++11 -fmodules -fcxx-modules -fmodules-cache-path=%t -I%S -I%S/Input | FileCheck --strict-whitespace %s -@import Level1A;
+@import Level1A; -// CHECK: ---
-// CHECK-NEXT: - Callback: moduleImport
-// CHECK-NEXT: ImportLoc: "{{.*}}{{[/\\]}}pp-trace-modules.cpp:3:2"
-// CHECK-NEXT: Path: [{Name: Level1A, Loc:"{{.*}}{{[/\\]}}pp-trace-modules.cpp:3:9"}]
-// CHECK-NEXT: Imported: Level1A
-// CHECK-NEXT: - Callback: EndOfMainFile
-// CHECK-NEXT: ...
+// CHECK: --- +// CHECK-NEXT: - Callback: moduleImport +// CHECK-NEXT: ImportLoc: "{{.*}}{{[/\\]}}pp-trace-modules.cpp:3:2" +// CHECK-NEXT: Path: [{Name: Level1A, Loc: "{{.*}}{{[/\\]}}pp-trace-modules.cpp:3:9"}] +// CHECK-NEXT: Imported: Level1A +// CHECK-NEXT: - Callback: EndOfMainFile +// CHECK-NEXT: ... |