diff options
-rw-r--r-- | test/CodeGen/address-space.c | 4 | ||||
-rw-r--r-- | test/CodeGen/atomic.c | 22 | ||||
-rw-r--r-- | test/CodeGen/attributes.c | 16 | ||||
-rw-r--r-- | test/CodeGen/builtin-count-zeros.c | 2 | ||||
-rw-r--r-- | test/CodeGen/builtin-stackaddress.c | 2 | ||||
-rw-r--r-- | test/CodeGen/constant-comparison.c | 2 | ||||
-rw-r--r-- | test/CodeGen/string-init.c | 2 | ||||
-rw-r--r-- | test/CodeGen/struct-x86-darwin.c | 4 | ||||
-rw-r--r-- | test/CodeGen/x86-inline-asm.c | 14 | ||||
-rw-r--r-- | test/Lexer/11-27-2007-FloatLiterals.c | 2 | ||||
-rw-r--r-- | test/Parser/control-scope.c | 2 | ||||
-rw-r--r-- | test/Parser/recovery-1.c | 2 | ||||
-rw-r--r-- | test/Preprocessor/expr_comma.c | 2 | ||||
-rw-r--r-- | test/Preprocessor/expr_invalid_tok.c | 4 | ||||
-rw-r--r-- | test/Preprocessor/macro_fn_varargs_named.c | 2 | ||||
-rw-r--r-- | test/Preprocessor/macro_paste_commaext.c | 6 | ||||
-rw-r--r-- | test/Preprocessor/output_paste_avoid.c | 2 | ||||
-rw-r--r-- | test/Preprocessor/print_line_track.c | 6 | ||||
-rw-r--r-- | test/Rewriter/objc-ivar-receiver-1.m | 2 |
19 files changed, 49 insertions, 49 deletions
diff --git a/test/CodeGen/address-space.c b/test/CodeGen/address-space.c index 20f41821a1..1c295a2457 100644 --- a/test/CodeGen/address-space.c +++ b/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/test/CodeGen/atomic.c b/test/CodeGen/atomic.c index a80d4666cb..0d2ea5a8a0 100644 --- a/test/CodeGen/atomic.c +++ b/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/test/CodeGen/attributes.c b/test/CodeGen/attributes.c index 95273f84a6..950a7a7b55 100644 --- a/test/CodeGen/attributes.c +++ b/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/test/CodeGen/builtin-count-zeros.c b/test/CodeGen/builtin-count-zeros.c index 26b139aa8c..5453cb1d89 100644 --- a/test/CodeGen/builtin-count-zeros.c +++ b/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/test/CodeGen/builtin-stackaddress.c b/test/CodeGen/builtin-stackaddress.c index 950723d5d3..ddfb9dc790 100644 --- a/test/CodeGen/builtin-stackaddress.c +++ b/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/test/CodeGen/constant-comparison.c b/test/CodeGen/constant-comparison.c index bc48ac4659..b7b2a0ed5a 100644 --- a/test/CodeGen/constant-comparison.c +++ b/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/test/CodeGen/string-init.c b/test/CodeGen/string-init.c index 1d1a740faa..c703c622ec 100644 --- a/test/CodeGen/string-init.c +++ b/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/test/CodeGen/struct-x86-darwin.c b/test/CodeGen/struct-x86-darwin.c index 68e6d72961..7a2e7de36b 100644 --- a/test/CodeGen/struct-x86-darwin.c +++ b/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/test/CodeGen/x86-inline-asm.c b/test/CodeGen/x86-inline-asm.c index 41fd7a72d8..7bdea97338 100644 --- a/test/CodeGen/x86-inline-asm.c +++ b/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/test/Lexer/11-27-2007-FloatLiterals.c b/test/Lexer/11-27-2007-FloatLiterals.c index 3f938576a7..c0e21546a8 100644 --- a/test/Lexer/11-27-2007-FloatLiterals.c +++ b/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/test/Parser/control-scope.c b/test/Parser/control-scope.c index 62f79dbdf1..3d588d63b4 100644 --- a/test/Parser/control-scope.c +++ b/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/test/Parser/recovery-1.c b/test/Parser/recovery-1.c index b7270b572a..d70cdab364 100644 --- a/test/Parser/recovery-1.c +++ b/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/test/Preprocessor/expr_comma.c b/test/Preprocessor/expr_comma.c index 55072723f6..e36f0407bf 100644 --- a/test/Preprocessor/expr_comma.c +++ b/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/test/Preprocessor/expr_invalid_tok.c b/test/Preprocessor/expr_invalid_tok.c index 82bfca36b8..877a845eff 100644 --- a/test/Preprocessor/expr_invalid_tok.c +++ b/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/test/Preprocessor/macro_fn_varargs_named.c b/test/Preprocessor/macro_fn_varargs_named.c index 095de82bbb..b3bb72c643 100644 --- a/test/Preprocessor/macro_fn_varargs_named.c +++ b/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/test/Preprocessor/macro_paste_commaext.c b/test/Preprocessor/macro_paste_commaext.c index 0fcd90d68d..e75ac1f574 100644 --- a/test/Preprocessor/macro_paste_commaext.c +++ b/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/test/Preprocessor/output_paste_avoid.c b/test/Preprocessor/output_paste_avoid.c index 065c73e939..7fe8788a26 100644 --- a/test/Preprocessor/output_paste_avoid.c +++ b/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/test/Preprocessor/print_line_track.c b/test/Preprocessor/print_line_track.c index 4fbef7407c..567da3c1a2 100644 --- a/test/Preprocessor/print_line_track.c +++ b/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/test/Rewriter/objc-ivar-receiver-1.m b/test/Rewriter/objc-ivar-receiver-1.m index 0274ff8362..5a9365f376 100644 --- a/test/Rewriter/objc-ivar-receiver-1.m +++ b/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 |