More workarounds for PR10867.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@169437 91177308-0d34-0410-b5e6-96231b3b80d8

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.

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.

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
 

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