Multiple tests in a single test file must be linked with '&&'.

Otherwise, failing tests other than the last one will not be reported.

llvm-svn: 52231

19 files changed, 49 insertions, 49 deletions

diff --git a/clang/test/CodeGen/address-space.c b/clang/test/CodeGen/address-space.c
index 20f41821a12..1c295a24570 100644
--- a/clang/test/CodeGen/address-space.c
+++ b/clang/test/CodeGen/address-space.c
@@ -1,5 +1,5 @@
-// RUN: clang -emit-llvm < %s 2>&1 | grep '@foo.*global.*addrspace(1)'
-// RUN: clang -emit-llvm < %s 2>&1 | grep '@ban.*global.*addrspace(1)'
+// RUN: clang -emit-llvm < %s 2>&1 | grep '@foo.*global.*addrspace(1)' &&
+// RUN: clang -emit-llvm < %s 2>&1 | grep '@ban.*global.*addrspace(1)' &&
 // RUN: clang -emit-llvm < %s 2>&1 | grep 'load.*addrspace(1)' | count 2
 int foo __attribute__((address_space(1)));
 int ban[10] __attribute__((address_space(1)));
diff --git a/clang/test/CodeGen/atomic.c b/clang/test/CodeGen/atomic.c
index a80d4666cbf..0d2ea5a8a06 100644
--- a/clang/test/CodeGen/atomic.c
+++ b/clang/test/CodeGen/atomic.c
@@ -1,14 +1,14 @@
-// RUN: clang %s -emit-llvm -o - > %t1
-// RUN: grep @llvm.atomic.las.i32 %t1
-// RUN: grep @llvm.atomic.lss.i32 %t1
-// RUN: grep @llvm.atomic.load.min.i32 %t1
-// RUN: grep @llvm.atomic.load.max.i32 %t1
-// RUN: grep @llvm.atomic.load.umin.i32 %t1
-// RUN: grep @llvm.atomic.load.umax.i32 %t1
-// RUN: grep @llvm.atomic.swap.i32 %t1
-// RUN: grep @llvm.atomic.lcs.i32 %t1
-// RUN: grep @llvm.atomic.load.and.i32 %t1
-// RUN: grep @llvm.atomic.load.or.i32 %t1
+// RUN: clang %s -emit-llvm -o - > %t1 &&
+// RUN: grep @llvm.atomic.las.i32 %t1 &&
+// RUN: grep @llvm.atomic.lss.i32 %t1 &&
+// RUN: grep @llvm.atomic.load.min.i32 %t1 &&
+// RUN: grep @llvm.atomic.load.max.i32 %t1 &&
+// RUN: grep @llvm.atomic.load.umin.i32 %t1 &&
+// RUN: grep @llvm.atomic.load.umax.i32 %t1 &&
+// RUN: grep @llvm.atomic.swap.i32 %t1 &&
+// RUN: grep @llvm.atomic.lcs.i32 %t1 &&
+// RUN: grep @llvm.atomic.load.and.i32 %t1 &&
+// RUN: grep @llvm.atomic.load.or.i32 %t1 &&
 // RUN: grep @llvm.atomic.load.xor.i32 %t1
 
 
diff --git a/clang/test/CodeGen/attributes.c b/clang/test/CodeGen/attributes.c
index 95273f84a60..950a7a7b55f 100644
--- a/clang/test/CodeGen/attributes.c
+++ b/clang/test/CodeGen/attributes.c
@@ -1,27 +1,27 @@
-// RUN: clang -emit-llvm < %s | grep 't1.*noreturn'
+// RUN: clang -emit-llvm < %s | grep 't1.*noreturn' &&
 void t1() __attribute__((noreturn));
 void t1() {}
 
-// RUN: clang -emit-llvm < %s | grep 't2.*nounwind'
+// RUN: clang -emit-llvm < %s | grep 't2.*nounwind' &&
 void t2() __attribute__((nothrow));
 void t2() {}
 
-// RUN: clang -emit-llvm < %s | grep 'weak.*t3'
+// RUN: clang -emit-llvm < %s | grep 'weak.*t3' &&
 void t3() __attribute__((weak));
 void t3() {}
 
-// RUN: clang -emit-llvm < %s | grep 'hidden.*t4'
+// RUN: clang -emit-llvm < %s | grep 'hidden.*t4' &&
 void t4() __attribute__((visibility("hidden")));
 void t4() {}
 
-// RUN: clang -emit-llvm < %s | grep 't5.*weak'
+// RUN: clang -emit-llvm < %s | grep 't5.*weak' &&
 int t5 __attribute__((weak)) = 2;
 
-// RUN: clang -emit-llvm < %s | grep 't6.*protected'
+// RUN: clang -emit-llvm < %s | grep 't6.*protected' &&
 int t6 __attribute__((visibility("protected")));
 
-// RUN: clang -emit-llvm < %s | grep 't7.*noreturn'
-// RUN: clang -emit-llvm < %s | grep 't7.*nounwind'
+// RUN: clang -emit-llvm < %s | grep 't7.*noreturn' &&
+// RUN: clang -emit-llvm < %s | grep 't7.*nounwind' &&
 void t7() __attribute__((noreturn, nothrow));
 void t7() {}
 
diff --git a/clang/test/CodeGen/builtin-count-zeros.c b/clang/test/CodeGen/builtin-count-zeros.c
index 26b139aa8c4..5453cb1d890 100644
--- a/clang/test/CodeGen/builtin-count-zeros.c
+++ b/clang/test/CodeGen/builtin-count-zeros.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o - | grep 'cttz' | count 2
+// RUN: clang -emit-llvm %s -o - | grep 'cttz' | count 2 &&
 // RUN: clang -emit-llvm %s -o - | grep 'ctlz' | count 2
 
 int a(int a) {return __builtin_ctz(a) + __builtin_clz(a);}
diff --git a/clang/test/CodeGen/builtin-stackaddress.c b/clang/test/CodeGen/builtin-stackaddress.c
index 950723d5d35..ddfb9dc790a 100644
--- a/clang/test/CodeGen/builtin-stackaddress.c
+++ b/clang/test/CodeGen/builtin-stackaddress.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm < %s | grep "llvm.returnaddress"
+// RUN: clang -emit-llvm < %s | grep "llvm.returnaddress" &&
 // RUN: clang -emit-llvm < %s | grep "llvm.frameaddress"
 void* a(unsigned x) {
 return __builtin_return_address(0);
diff --git a/clang/test/CodeGen/constant-comparison.c b/clang/test/CodeGen/constant-comparison.c
index bc48ac46592..b7b2a0ed5ab 100644
--- a/clang/test/CodeGen/constant-comparison.c
+++ b/clang/test/CodeGen/constant-comparison.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o - 2>&1 | not grep warning
+// RUN: clang -emit-llvm %s -o - 2>&1 | not grep warning &&
 // RUN: clang -emit-llvm %s -o - | grep @b | count 1
 
 int a, b;
diff --git a/clang/test/CodeGen/string-init.c b/clang/test/CodeGen/string-init.c
index 1d1a740faac..c703c622ec7 100644
--- a/clang/test/CodeGen/string-init.c
+++ b/clang/test/CodeGen/string-init.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm %s -o - | not grep "[5 x i8]"
+// RUN: clang -emit-llvm %s -o - | not grep "[5 x i8]" &&
 // RUN: clang -emit-llvm %s -o - | not grep "store"
 
 void test(void) {
diff --git a/clang/test/CodeGen/struct-x86-darwin.c b/clang/test/CodeGen/struct-x86-darwin.c
index 68e6d729618..7a2e7de36b1 100644
--- a/clang/test/CodeGen/struct-x86-darwin.c
+++ b/clang/test/CodeGen/struct-x86-darwin.c
@@ -5,8 +5,8 @@
 // RUN: grep "STestB1 = type <{ i8, i8 }>" %t1 &&
 // RUN: grep "STestB2 = type <{ i8, i8, i8 }>" %t1 &&
 // RUN: grep "STestB3 = type <{ i8, i8 }>" %t1 &&
-// RUN: grep "STestB4 = type <{ i8, i8, i8, i8 }>" %t1
-// RUN: grep "STestB5 = type <{ i8, i8, i8, i8, i8, i8 }>" %t1
+// RUN: grep "STestB4 = type <{ i8, i8, i8, i8 }>" %t1 &&
+// RUN: grep "STestB5 = type <{ i8, i8, i8, i8, i8, i8 }>" %t1 &&
 // RUN: grep "STestB6 = type <{ i8, i8, i8, i8 }>" %t1
 // Test struct layout for x86-darwin target
 
diff --git a/clang/test/CodeGen/x86-inline-asm.c b/clang/test/CodeGen/x86-inline-asm.c
index 41fd7a72d81..7bdea973382 100644
--- a/clang/test/CodeGen/x86-inline-asm.c
+++ b/clang/test/CodeGen/x86-inline-asm.c
@@ -1,11 +1,11 @@
 // RUN: clang %s -triple=i686-pc-linux-gnu -emit-llvm -o - > %t1
-// RUN: grep "ax" %t1
-// RUN: grep "bx" %t1
-// RUN: grep "cx" %t1
-// RUN: grep "dx" %t1
-// RUN: grep "di" %t1
-// RUN: grep "si" %t1
-// RUN: grep "st" %t1
+// RUN: grep "ax" %t1 &&
+// RUN: grep "bx" %t1 &&
+// RUN: grep "cx" %t1 &&
+// RUN: grep "dx" %t1 &&
+// RUN: grep "di" %t1 &&
+// RUN: grep "si" %t1 &&
+// RUN: grep "st" %t1 &&
 // RUN: grep "st(1)" %t1
 
 void f() {
diff --git a/clang/test/Lexer/11-27-2007-FloatLiterals.c b/clang/test/Lexer/11-27-2007-FloatLiterals.c
index 3f938576a7f..c0e21546a85 100644
--- a/clang/test/Lexer/11-27-2007-FloatLiterals.c
+++ b/clang/test/Lexer/11-27-2007-FloatLiterals.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -emit-llvm -o - | grep 0x3BFD83C940000000 | count 2
+// RUN: clang %s -emit-llvm -o - | grep 0x3BFD83C940000000 | count 2 &&
 // RUN: clang %s -emit-llvm -o - | grep 2.000000e+32 | count 2
 
 float  F  = 1e-19f;
diff --git a/clang/test/Parser/control-scope.c b/clang/test/Parser/control-scope.c
index 62f79dbdf17..3d588d63b4c 100644
--- a/clang/test/Parser/control-scope.c
+++ b/clang/test/Parser/control-scope.c
@@ -1,4 +1,4 @@
-// RUN: not clang %s -std=c90
+// RUN: not clang %s -std=c90 &&
 // RUN: clang %s -std=c99
 
 int f (int z) { 
diff --git a/clang/test/Parser/recovery-1.c b/clang/test/Parser/recovery-1.c
index b7270b572a9..d70cdab364a 100644
--- a/clang/test/Parser/recovery-1.c
+++ b/clang/test/Parser/recovery-1.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -fno-caret-diagnostics -pedantic %s 2>&1 | grep warning | wc -l | grep 1
+// RUN: clang -fsyntax-only -fno-caret-diagnostics -pedantic %s 2>&1 | grep warning | wc -l | grep 1 &&
 // RUN: clang -fsyntax-only -verify -pedantic %s
 
 char ((((                       /* expected-error {{to match this '('}} */
diff --git a/clang/test/Preprocessor/expr_comma.c b/clang/test/Preprocessor/expr_comma.c
index 55072723f6b..e36f0407bf8 100644
--- a/clang/test/Preprocessor/expr_comma.c
+++ b/clang/test/Preprocessor/expr_comma.c
@@ -1,5 +1,5 @@
 // Comma is not allowed in C89
-// RUN: not clang -E %s -std=c89 -pedantic-errors 
+// RUN: not clang -E %s -std=c89 -pedantic-errors &&
 
 // Comma is allowed if unevaluated in C99
 // RUN: clang -E %s -std=c99 -pedantic-errors 
diff --git a/clang/test/Preprocessor/expr_invalid_tok.c b/clang/test/Preprocessor/expr_invalid_tok.c
index 82bfca36b8f..877a845eff6 100644
--- a/clang/test/Preprocessor/expr_invalid_tok.c
+++ b/clang/test/Preprocessor/expr_invalid_tok.c
@@ -1,5 +1,5 @@
-// RUN: not clang -E %s 2>&1 | grep 'invalid token at start of a preprocessor expression'
-// RUN: not clang -E %s 2>&1 | grep 'token is not a valid binary operator in a preprocessor subexpression'
+// RUN: not clang -E %s 2>&1 | grep 'invalid token at start of a preprocessor expression' &&
+// RUN: not clang -E %s 2>&1 | grep 'token is not a valid binary operator in a preprocessor subexpression' &&
 // RUN: not clang -E %s 2>&1 | grep ':14: error: expected end of line in preprocessor expression'
 // PR2220
 
diff --git a/clang/test/Preprocessor/macro_fn_varargs_named.c b/clang/test/Preprocessor/macro_fn_varargs_named.c
index 095de82bbb7..b3bb72c6431 100644
--- a/clang/test/Preprocessor/macro_fn_varargs_named.c
+++ b/clang/test/Preprocessor/macro_fn_varargs_named.c
@@ -1,5 +1,5 @@
 // RUN: clang -E %s | grep '^a: x$' &&
-// RUN: clang -E %s | grep '^b: x y, z,h$'
+// RUN: clang -E %s | grep '^b: x y, z,h$' &&
 // RUN: clang -E %s | grep '^c: foo(x)$'
 
 #define A(b, c...) b c
diff --git a/clang/test/Preprocessor/macro_paste_commaext.c b/clang/test/Preprocessor/macro_paste_commaext.c
index 0fcd90d68d1..e75ac1f5740 100644
--- a/clang/test/Preprocessor/macro_paste_commaext.c
+++ b/clang/test/Preprocessor/macro_paste_commaext.c
@@ -1,7 +1,7 @@
 // RUN: clang %s -E | grep 'V);' &&
-// RUN: clang %s -E | grep 'W, 1, 2);'
-// RUN: clang %s -E | grep 'X, 1, 2);'
-// RUN: clang %s -E | grep 'Y, );'
+// RUN: clang %s -E | grep 'W, 1, 2);' &&
+// RUN: clang %s -E | grep 'X, 1, 2);' &&
+// RUN: clang %s -E | grep 'Y, );' &&
 // RUN: clang %s -E | grep 'Z, );'
 
 #define debug(format, ...) format, ## __VA_ARGS__)
diff --git a/clang/test/Preprocessor/output_paste_avoid.c b/clang/test/Preprocessor/output_paste_avoid.c
index 065c73e9390..7fe8788a267 100644
--- a/clang/test/Preprocessor/output_paste_avoid.c
+++ b/clang/test/Preprocessor/output_paste_avoid.c
@@ -1,5 +1,5 @@
 // RUN: clang -E %s | grep '+ + - - + + = = =' &&
-// RUN: clang -E %s | not grep -F '...'
+// RUN: clang -E %s | not grep -F '...' &&
 // RUN: clang -E %s | not grep -F 'L"str"'
 
 // This should print as ".. ." to avoid turning into ...
diff --git a/clang/test/Preprocessor/print_line_track.c b/clang/test/Preprocessor/print_line_track.c
index 4fbef7407cf..567da3c1a21 100644
--- a/clang/test/Preprocessor/print_line_track.c
+++ b/clang/test/Preprocessor/print_line_track.c
@@ -1,6 +1,6 @@
-/* RUN: clang -E %s | grep 'a 3'
- * RUN: clang -E %s | grep 'b 14'
- * RUN: clang -E -P %s | grep 'a 3'
+/* RUN: clang -E %s | grep 'a 3' &&
+ * RUN: clang -E %s | grep 'b 14' &&
+ * RUN: clang -E -P %s | grep 'a 3' &&
  * RUN: clang -E -P %s | grep 'b 14'
  * PR1848
 */
diff --git a/clang/test/Rewriter/objc-ivar-receiver-1.m b/clang/test/Rewriter/objc-ivar-receiver-1.m
index 0274ff83625..5a9365f376f 100644
--- a/clang/test/Rewriter/objc-ivar-receiver-1.m
+++ b/clang/test/Rewriter/objc-ivar-receiver-1.m
@@ -1,4 +1,4 @@
-// RUN: clang -rewrite-objc %s -o -
+// RUN: clang -rewrite-objc %s -o - &&
 // RUN: clang -rewrite-objc %s -o - | grep 'newInv->_container'
 
 @interface NSMutableArray