diff options
author | Daniel Dunbar <daniel@zuster.org> | 2009-07-25 11:27:37 +0000 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2009-07-25 11:27:37 +0000 |
commit | 025f80dfc21a24b910f2b8442a16796ce5de8379 (patch) | |
tree | 8aa027fc4fcc502e579cbd3e0e8a039d837c14fc /test | |
parent | 78a88e7233aece64a57741de617d6b80b6082be1 (diff) | |
download | clang-025f80dfc21a24b910f2b8442a16796ce5de8379.tar.gz |
MultiTestRunner: Validate '&&' at the end of RUN lines.
- This is just to normalize, these will go away soon hopefully.
Added all the missing '&&'s that have crept in. :)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@77062 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
25 files changed, 34 insertions, 34 deletions
diff --git a/test/CodeGen/2008-07-17-no-emit-on-error.c b/test/CodeGen/2008-07-17-no-emit-on-error.c index 89aeb18d9d..51ba2b45d0 100644 --- a/test/CodeGen/2008-07-17-no-emit-on-error.c +++ b/test/CodeGen/2008-07-17-no-emit-on-error.c @@ -1,5 +1,5 @@ -// RUN: rm -f %t1.bc -// RUN: not clang-cc %s -emit-llvm-bc -o %t1.bc +// RUN: rm -f %t1.bc && +// RUN: not clang-cc %s -emit-llvm-bc -o %t1.bc && // RUN: not test -f %t1.bc void f() { diff --git a/test/CodeGen/address-space-field4.c b/test/CodeGen/address-space-field4.c index d258f614e6..2c74353c3a 100644 --- a/test/CodeGen/address-space-field4.c +++ b/test/CodeGen/address-space-field4.c @@ -1,5 +1,5 @@ // RUN: clang-cc -emit-llvm < %s -o %t && -// RUN: grep addrspace\(2\) %t | count 4 +// RUN: grep addrspace\(2\) %t | count 4 && // RUN: grep addrspace\(3\) %t | count 4 // Check the load and store are using the correct address space to access diff --git a/test/CodeGen/asm.c b/test/CodeGen/asm.c index 58373fc4c9..f400e9347a 100644 --- a/test/CodeGen/asm.c +++ b/test/CodeGen/asm.c @@ -33,7 +33,7 @@ void t7(int a) { __asm__ volatile("T7 NAMED: %[input]" : "+r"(a): [input] "i" (4)); } -// RUN: grep "T8 NAMED MODIFIER: \${0:c}" %t +// RUN: grep "T8 NAMED MODIFIER: \${0:c}" %t && void t8() { __asm__ volatile("T8 NAMED MODIFIER: %c[input]" :: [input] "i" (4)); } diff --git a/test/CodeGen/attributes.c b/test/CodeGen/attributes.c index 00252b1135..7191f98c41 100644 --- a/test/CodeGen/attributes.c +++ b/test/CodeGen/attributes.c @@ -12,7 +12,7 @@ // RUN: grep '@t11().*section "SECT"' %t && // RUN: grep '@t12 =.*section "SECT"' %t && // RUN: grep '@t13 =.*section "SECT"' %t && -// RUN: grep '@t14.x =.*section "SECT"' %t +// RUN: grep '@t14.x =.*section "SECT"' %t && // RUN: grep 'declare extern_weak i32 @t15()' %t && // RUN: grep '@t16 = extern_weak global i32' %t && diff --git a/test/CodeGen/blocks-2.c b/test/CodeGen/blocks-2.c index 5ee2a73a82..d3ccda6d99 100644 --- a/test/CodeGen/blocks-2.c +++ b/test/CodeGen/blocks-2.c @@ -1,4 +1,4 @@ -// RUN: clang-cc -g %s -emit-llvm -o %t -fblocks +// RUN: clang-cc -g %s -emit-llvm -o %t -fblocks && // RUN: grep "func.start" %t | count 4 // 1 declaration, 1 bar, 1 test_block_dbg and 1 for the block. diff --git a/test/CodeGen/builtins-ffs_parity_popcount.c b/test/CodeGen/builtins-ffs_parity_popcount.c index 47469985ee..e3fa4d2d82 100644 --- a/test/CodeGen/builtins-ffs_parity_popcount.c +++ b/test/CodeGen/builtins-ffs_parity_popcount.c @@ -1,5 +1,5 @@ -// RUN: clang-cc -emit-llvm -o - %s > %t -// RUN: ! grep "__builtin" %t +// RUN: clang-cc -emit-llvm -o - %s > %t && +// RUN: not grep "__builtin" %t #include <stdio.h> diff --git a/test/CodeGen/builtins-powi.c b/test/CodeGen/builtins-powi.c index 73f752f5e8..5b413a8895 100644 --- a/test/CodeGen/builtins-powi.c +++ b/test/CodeGen/builtins-powi.c @@ -1,5 +1,5 @@ -// RUN: clang-cc -emit-llvm -o - %s > %t -// RUN: ! grep "__builtin" %t +// RUN: clang-cc -emit-llvm -o - %s > %t && +// RUN: not grep "__builtin" %t #include <stdio.h> #include <stdlib.h> diff --git a/test/CodeGen/darwin-string-literals.c b/test/CodeGen/darwin-string-literals.c index 2f94d557ca..2444a155b3 100644 --- a/test/CodeGen/darwin-string-literals.c +++ b/test/CodeGen/darwin-string-literals.c @@ -1,4 +1,4 @@ -// RUN: clang-cc -triple i386-apple-darwin9 -emit-llvm %s -o - | FileCheck -check-prefix LSB %s +// RUN: clang-cc -triple i386-apple-darwin9 -emit-llvm %s -o - | FileCheck -check-prefix LSB %s && // CHECK-LSB: @.str = private constant [8 x i8] c"string0\00" // CHECK-LSB: @.str1 = private constant [8 x i8] c"string1\00", section "__TEXT,__cstring,cstring_literals" diff --git a/test/CodeGen/ext-vector-shuffle.c b/test/CodeGen/ext-vector-shuffle.c index 37d3ed42d0..f53db945da 100644 --- a/test/CodeGen/ext-vector-shuffle.c +++ b/test/CodeGen/ext-vector-shuffle.c @@ -1,5 +1,5 @@ -// RUN: clang-cc %s -emit-llvm -o - | not grep 'extractelement' -// RUN: clang-cc %s -emit-llvm -o - | not grep 'insertelement' +// RUN: clang-cc %s -emit-llvm -o - | not grep 'extractelement' && +// RUN: clang-cc %s -emit-llvm -o - | not grep 'insertelement' && // RUN: clang-cc %s -emit-llvm -o - | grep 'shufflevector' typedef __attribute__(( ext_vector_type(2) )) float float2; diff --git a/test/CodeGen/stdcall-fastcall.c b/test/CodeGen/stdcall-fastcall.c index 11b652178c..89ed8c9ef6 100644 --- a/test/CodeGen/stdcall-fastcall.c +++ b/test/CodeGen/stdcall-fastcall.c @@ -1,4 +1,4 @@ -// RUN: clang-cc -emit-llvm < %s | grep 'fastcallcc' | count 4 +// RUN: clang-cc -emit-llvm < %s | grep 'fastcallcc' | count 4 && // RUN: clang-cc -emit-llvm < %s | grep 'stdcallcc' | count 4 void __attribute__((fastcall)) f1(void); diff --git a/test/CodeGen/struct-x86-darwin.c b/test/CodeGen/struct-x86-darwin.c index 050e26dcab..46dcb0c826 100644 --- a/test/CodeGen/struct-x86-darwin.c +++ b/test/CodeGen/struct-x86-darwin.c @@ -1,4 +1,4 @@ -// RUN: clang-cc < %s -emit-llvm > %t1 -triple=i686-apple-darwin9 +// RUN: clang-cc < %s -emit-llvm > %t1 -triple=i686-apple-darwin9 && // Run grep "STest1 = type <{ i32, \[4 x i16\], double }>" %t1 && // RUN: grep "STest2 = type <{ i16, i16, i32, i32 }>" %t1 && // RUN: grep "STest3 = type <{ i8, i8, i16, i32 }>" %t1 && diff --git a/test/CodeGen/visibility.c b/test/CodeGen/visibility.c index bb9b6e0d50..958eb618ee 100644 --- a/test/CodeGen/visibility.c +++ b/test/CodeGen/visibility.c @@ -15,7 +15,7 @@ // RUN: grep 'define internal void @f_deferred()' %t && // RUN: grep 'define protected i32 @f_def()' %t && // RUN: clang-cc -triple i386-unknown-unknown -fvisibility=hidden -emit-llvm -o %t %s && -// RUN: grep '@g_com = common hidden global i32 0' %t &&a +// RUN: grep '@g_com = common hidden global i32 0' %t && // RUN: grep '@g_def = hidden global i32 0' %t && // RUN: grep '@g_ext = external global i32' %t && // RUN: grep '@g_deferred = internal global' %t && diff --git a/test/CodeGen/x86.c b/test/CodeGen/x86.c index 66d8251379..be0930237c 100644 --- a/test/CodeGen/x86.c +++ b/test/CodeGen/x86.c @@ -1,4 +1,4 @@ -// RUN: clang-cc %s -triple=i686-pc-linux-gnu -emit-llvm -o - > %t1 +// RUN: clang-cc %s -triple=i686-pc-linux-gnu -emit-llvm -o - > %t1 && // RUN: grep "ax" %t1 && // RUN: grep "bx" %t1 && // RUN: grep "cx" %t1 && diff --git a/test/CodeGenObjC/debug-info-linkagename.m b/test/CodeGenObjC/debug-info-linkagename.m index bda98eec49..730568954c 100644 --- a/test/CodeGenObjC/debug-info-linkagename.m +++ b/test/CodeGenObjC/debug-info-linkagename.m @@ -1,4 +1,4 @@ -// RUN: clang-cc -g -S -o %t %s +// RUN: clang-cc -g -S -o %t %s && // RUN: not grep 001 %t @interface F diff --git a/test/CodeGenObjC/messages.m b/test/CodeGenObjC/messages.m index f9b9be6e11..3a0c4ef26d 100644 --- a/test/CodeGenObjC/messages.m +++ b/test/CodeGenObjC/messages.m @@ -3,7 +3,7 @@ // RUN: clang-cc -fgnu-runtime --emit-llvm -o %t %s && // RUN: grep "objc_msg_lookup" %t | count 6 && // RUN: clang-cc -fgnu-runtime -fobjc-sender-dependent-dispatch --emit-llvm -o %t %s && -// RUN: grep "objc_msg_lookup_sender" %t | count 6 +// RUN: grep "objc_msg_lookup_sender" %t | count 6 && // RUN: true typedef struct { diff --git a/test/CodeGenObjC/property-setter-attr.m b/test/CodeGenObjC/property-setter-attr.m index 390392415d..5f0edf8271 100644 --- a/test/CodeGenObjC/property-setter-attr.m +++ b/test/CodeGenObjC/property-setter-attr.m @@ -1,4 +1,4 @@ -// RUN: clang-cc -emit-llvm -triple=i686-apple-darwin8 -o %t %s +// RUN: clang-cc -emit-llvm -triple=i686-apple-darwin8 -o %t %s && // RUN: grep -e "SiSetOtherThings:" %t @interface A diff --git a/test/Driver/clang-translation.c b/test/Driver/clang-translation.c index 0a1ef59b13..e0b9e3ada6 100644 --- a/test/Driver/clang-translation.c +++ b/test/Driver/clang-translation.c @@ -1,4 +1,4 @@ -// RUN: clang -ccc-host-triple i386-unknown-unknown -### -S -O0 -Os %s -o %t.s -fverbose-asm 2> %t.log +// RUN: clang -ccc-host-triple i386-unknown-unknown -### -S -O0 -Os %s -o %t.s -fverbose-asm 2> %t.log && // RUN: grep '"-triple" "i386-unknown-unknown"' %t.log && // RUN: grep '"-S"' %t.log && // RUN: grep '"-disable-free"' %t.log && @@ -9,8 +9,8 @@ // RUN: grep '"-Os"' %t.log && // RUN: grep '"-o" .*clang-translation.*' %t.log && // RUN: grep '"--asm-verbose"' %t.log && -// RUN: clang -ccc-host-triple i386-apple-darwin9 -### -S %s -o %t.s 2> %t.log +// RUN: clang -ccc-host-triple i386-apple-darwin9 -### -S %s -o %t.s 2> %t.log && // RUN: grep '"--mcpu=yonah"' %t.log && -// RUN: clang -ccc-host-triple x86_64-apple-darwin9 -### -S %s -o %t.s 2> %t.log +// RUN: clang -ccc-host-triple x86_64-apple-darwin9 -### -S %s -o %t.s 2> %t.log && // RUN: grep '"--mcpu=core2"' %t.log && // RUN: true diff --git a/test/Driver/default-toolchain.c b/test/Driver/default-toolchain.c index 216394fe97..0e8a02679e 100644 --- a/test/Driver/default-toolchain.c +++ b/test/Driver/default-toolchain.c @@ -1,8 +1,8 @@ -// RUN: clang -ccc-host-triple i386-unknown-unknown -m64 -v 2> %t +// RUN: clang -ccc-host-triple i386-unknown-unknown -m64 -v 2> %t && // RUN: grep 'Target: x86_64-unknown-unknown' %t && -// RUN: clang -ccc-host-triple i386-apple-darwin9 -arch ppc -m64 -v 2> %t +// RUN: clang -ccc-host-triple i386-apple-darwin9 -arch ppc -m64 -v 2> %t && // RUN: grep 'Target: powerpc64-apple-darwin9' %t && -// RUN: clang -ccc-host-triple i386-apple-darwin9 -arch ppc64 -m32 -v 2> %t +// RUN: clang -ccc-host-triple i386-apple-darwin9 -arch ppc64 -m32 -v 2> %t && // RUN: grep 'Target: powerpc-apple-darwin9' %t diff --git a/test/Driver/redzone.c b/test/Driver/redzone.c index 8709e71fb3..bc8a80fa96 100644 --- a/test/Driver/redzone.c +++ b/test/Driver/redzone.c @@ -1,5 +1,5 @@ // RUN: clang -mno-red-zone %s -S -emit-llvm -o %t.log && -// RUN: grep 'noredzone' %t.log +// RUN: grep 'noredzone' %t.log && // RUN: clang -mred-zone %s -S -emit-llvm -o %t.log && // RUN: grep -v 'noredzone' %t.log diff --git a/test/Frontend/stdin.c b/test/Frontend/stdin.c index 35fe45d35b..5b719b2e13 100644 --- a/test/Frontend/stdin.c +++ b/test/Frontend/stdin.c @@ -1,3 +1,3 @@ -// RUN: clang-cc -E - < /dev/null > %t +// RUN: clang-cc -E - < /dev/null > %t && // RUN: grep '<built-in>' %t diff --git a/test/Index/find-refs.c b/test/Index/find-refs.c index 9212922ba6..741f840d08 100644 --- a/test/Index/find-refs.c +++ b/test/Index/find-refs.c @@ -38,7 +38,7 @@ // RUN: index-test %t1.ast %t2.ast -point-at %S/t1.c:16:7 -print-refs > %t && // RUN: cat %t | count 1 && -// RUN: grep 't1.c:22:3,' %t +// RUN: grep 't1.c:22:3,' %t && // RUN: index-test %t1.ast %t2.ast -point-at %S/foo.h:7:11 -print-refs > %t && // RUN: cat %t | count 2 && diff --git a/test/Lexer/dollar-idents.c b/test/Lexer/dollar-idents.c index 7635ea112e..f5c33b1f43 100644 --- a/test/Lexer/dollar-idents.c +++ b/test/Lexer/dollar-idents.c @@ -1,5 +1,5 @@ // RUN: clang-cc -dump-tokens %s 2> %t && -// RUN: grep "identifier '\$A'" %t +// RUN: grep "identifier '\$A'" %t && // RUN: clang-cc -dump-tokens -x assembler-with-cpp %s 2> %t && // RUN: grep "identifier 'A'" %t // PR3808 diff --git a/test/Preprocessor/macro-multiline.c b/test/Preprocessor/macro-multiline.c index eb15668ce3..ba988253b2 100644 --- a/test/Preprocessor/macro-multiline.c +++ b/test/Preprocessor/macro-multiline.c @@ -1,4 +1,4 @@ -// RUN: clang -E %s "-DX=A +// RUN: clang -E %s "-DX=A && // RUN: THIS_SHOULD_NOT_EXIST_IN_THE_OUTPUT" > %t && // RUN: grep "GOOD: A" %t && // RUN: not grep THIS_SHOULD_NOT_EXIST_IN_THE_OUTPUT %t diff --git a/test/Preprocessor/macro_fn_comma_swallow.c b/test/Preprocessor/macro_fn_comma_swallow.c index e985138a5c..d39d4e7841 100644 --- a/test/Preprocessor/macro_fn_comma_swallow.c +++ b/test/Preprocessor/macro_fn_comma_swallow.c @@ -1,7 +1,7 @@ // Test the GNU comma swallowing extension. // RUN: clang-cc %s -E | grep 'foo{A, }' && // RUN: clang-cc %s -E | grep 'fo2{A,}' && -// RUN: clang-cc %s -E | grep '{foo}' +// RUN: clang-cc %s -E | grep '{foo}' && #define X(Y) foo{A, Y} X() diff --git a/test/Preprocessor/macro_paste_mscomment.c b/test/Preprocessor/macro_paste_mscomment.c index b0fc57101c..d6ead91068 100644 --- a/test/Preprocessor/macro_paste_mscomment.c +++ b/test/Preprocessor/macro_paste_mscomment.c @@ -1,5 +1,5 @@ -// RUN: clang-cc -P -E -fms-extensions %s | sed '/^#.\+/d' | tr -d '\n' | -// RUN: grep '^int foo;int bar;int baz;$' | count 1 +// RUN: clang-cc -P -E -fms-extensions %s | sed '/^#.\+/d' | tr -d '\n' > %t && +// RUN: grep '^int foo;int bar;int baz;$' %t | count 1 // This horrible stuff should preprocess into (other than whitespace): // int foo; // int bar; |