diff options
| -rw-r--r-- | lib/Tooling/Tooling.cpp | 10 | ||||
| -rw-r--r-- | test/Tooling/pch.cpp | 12 |
2 files changed, 13 insertions, 9 deletions
diff --git a/lib/Tooling/Tooling.cpp b/lib/Tooling/Tooling.cpp index a9e7b84808..52855f657f 100644 --- a/lib/Tooling/Tooling.cpp +++ b/lib/Tooling/Tooling.cpp @@ -22,6 +22,7 @@ #include "clang/Tooling/ArgumentsAdjusters.h" #include "clang/Tooling/CompilationDatabase.h" #include "llvm/ADT/STLExtras.h" +#include "llvm/Support/Debug.h" #include "llvm/Support/FileSystem.h" #include "llvm/Support/Host.h" #include "llvm/Support/raw_ostream.h" @@ -295,14 +296,19 @@ int ClangTool::run(FrontendActionFactory *ActionFactory) { ArgsAdjuster->Adjust(CompileCommands[I].second.CommandLine); assert(!CommandLine.empty()); CommandLine[0] = MainExecutable; - llvm::outs() << "Processing: " << File << ".\n"; + // FIXME: We need a callback mechanism for the tool writer to output a + // customized message for each file. + DEBUG({ + llvm::dbgs() << "Processing: " << File << ".\n"; + }); ToolInvocation Invocation(CommandLine, ActionFactory->create(), &Files); for (int I = 0, E = MappedFileContents.size(); I != E; ++I) { Invocation.mapVirtualFile(MappedFileContents[I].first, MappedFileContents[I].second); } if (!Invocation.run()) { - llvm::outs() << "Error while processing " << File << ".\n"; + // FIXME: Diagnostics should be used instead. + llvm::errs() << "Error while processing " << File << ".\n"; ProcessingFailed = true; } } diff --git a/test/Tooling/pch.cpp b/test/Tooling/pch.cpp index 715c95dd55..40bc1e9731 100644 --- a/test/Tooling/pch.cpp +++ b/test/Tooling/pch.cpp @@ -6,12 +6,10 @@ // RUN: %clang -x c++-header %S/Inputs/pch.h -o %t1 // Use the generated pch and enforce a subsequent stat miss by using -// the test file with an unrelated include as second translation unit: -// Do not directly pipe into FileCheck, as that would hide errors from -// valgrind due to pipefail not being set in lit. -// RUN: clang-check "%S/Inputs/pch.cpp" "%s" -- -include-pch %t1 -I "%S" -c >%t2 2>&1 -// RUN: FileCheck %s < %t2 +// the test file with an unrelated include as second translation unit. +// Test for an non-empty file after clang-check is executed. +// RUN: clang-check -ast-dump "%S/Inputs/pch.cpp" "%s" -- -include-pch %t1 -I "%S" -c >%t2 2>&1 +// REQUIRES: shell +// RUN: test -s %t2 #include "Inputs/pch-fail.h" - -// CHECK: Processing |