diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-12-05 22:33:14 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-12-05 22:33:14 +0000 |
| commit | 9867ebaac9efe9346fcdc3bc816c85a7a25c6bf2 (patch) | |
| tree | 8ada7bcafe7f7d8da387509a3d94a9a058309518 | |
| parent | 65bcdabba34fddc303ab97f60dfea6079989306a (diff) | |
More workarounds for PR10867.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@169437 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | test/Misc/serialized-diags-frontend.c | 2 | ||||
| -rw-r--r-- | test/Misc/serialized-diags-no-category.c | 2 | ||||
| -rw-r--r-- | test/Misc/serialized-diags.c | 2 | ||||
| -rw-r--r-- | test/PCH/missing-file.cpp | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/test/Misc/serialized-diags-frontend.c b/test/Misc/serialized-diags-frontend.c index 453ed1470a..7eab021937 100644 --- a/test/Misc/serialized-diags-frontend.c +++ b/test/Misc/serialized-diags-frontend.c @@ -1,5 +1,5 @@ // RUN: rm -f %t -// RUN: %clang -fsyntax-only %s -Wblahblah --serialize-diagnostics %t > /dev/null 2>&1 || true +// RUN: %clang -fsyntax-only %s -Wblahblah --serialize-diagnostics %t > /dev/null 2>&1 // RUN: c-index-test -read-diagnostics %t 2>&1 | FileCheck %s // This test case tests that we can handle frontend diagnostics. diff --git a/test/Misc/serialized-diags-no-category.c b/test/Misc/serialized-diags-no-category.c index 3074892e0e..1b0f2043b5 100644 --- a/test/Misc/serialized-diags-no-category.c +++ b/test/Misc/serialized-diags-no-category.c @@ -2,7 +2,7 @@ #error bar // RUN: rm -f %t -// RUN: %clang -ferror-limit=1 -fsyntax-only %s --serialize-diagnostics %t > /dev/null 2>&1 || true +// RUN: not %clang -ferror-limit=1 -fsyntax-only %s --serialize-diagnostics %t > /dev/null 2>&1 // RUN: c-index-test -read-diagnostics %t 2>&1 | FileCheck %s // This test case tests that we can handle both fatal errors and errors without categories. diff --git a/test/Misc/serialized-diags.c b/test/Misc/serialized-diags.c index ae4611ba66..1290b4ea9f 100644 --- a/test/Misc/serialized-diags.c +++ b/test/Misc/serialized-diags.c @@ -31,7 +31,7 @@ void rdar11040133() { } // RUN: rm -f %t -// RUN: %clang -Wall -fsyntax-only %s --serialize-diagnostics %t.diag > /dev/null 2>&1 || true +// RUN: not %clang -Wall -fsyntax-only %s --serialize-diagnostics %t.diag > /dev/null 2>&1 // RUN: c-index-test -read-diagnostics %t.diag > %t 2>&1 // RUN: FileCheck --input-file=%t %s diff --git a/test/PCH/missing-file.cpp b/test/PCH/missing-file.cpp index 7dd11d4561..5f258eacc1 100644 --- a/test/PCH/missing-file.cpp +++ b/test/PCH/missing-file.cpp @@ -7,7 +7,8 @@ // %t.h might be touched by scanners as a hot file on Windows, // to fail to remove %.h with single run. -// RUN: rm %t.h || rm %t.h || rm %t.h +// FIXME: Do we really want to work around bugs in virus checkers here? +// RUN: (rm %t.h || rm %t.h || rm %t.h) // Check diagnostic with location in original source: // RUN: not %clang_cc1 -include-pch %t.h.pch -emit-obj -o %t.o %s 2> %t.stderr |