Changes in directory llvm/test/CFrontend:
2003-07-22-ArrayAccessTypeSafety.c.tr updated: 1.3 -> 1.4 2003-08-06-BuiltinSetjmpLongjmp.c.tr updated: 1.2 -> 1.3 2004-02-13-BuiltinFrameReturnAddress.c.tr updated: 1.1 -> 1.2 2004-11-27-InvalidConstantExpr.c updated: 1.1 -> 1.2 2004-11-27-StaticFunctionRedeclare.c updated: 1.1 -> 1.2 2005-02-27-MarkGlobalConstant.c updated: 1.2 -> 1.3 2005-09-20-ComplexConstants.c updated: 1.1 -> 1.2 2005-09-24-AsmUserPrefix.c updated: 1.2 -> 1.3 2005-12-04-AttributeUsed.c updated: 1.3 -> 1.4 2005-12-04-DeclarationLineNumbers.c updated: 1.5 -> 1.6 2006-01-16-BitCountIntrinsicsUnsigned.c updated: 1.2 -> 1.3 2006-01-23-FileScopeAsm.c updated: 1.4 -> 1.5 2006-03-03-MissingInitializer.c updated: 1.3 -> 1.4 2006-09-28-SimpleAsm.c updated: 1.3 -> 1.4 2006-12-14-ordered_expr.c updated: 1.2 -> 1.3 2007-01-24-InlineAsmCModifier.c updated: 1.1 -> 1.2 2007-02-16-WritableStrings.c updated: 1.1 -> 1.2 2007-02-25-C-DotDotDot.c updated: 1.1 -> 1.2 2007-03-05-DataLayout.c updated: 1.4 -> 1.5 2007-04-11-InlineAsmStruct.c updated: 1.1 -> 1.2 2007-04-11-InlineAsmUnion.c updated: 1.2 -> 1.3 2007-04-11-InlineStorageClassC89.c updated: 1.1 -> 1.2 2007-04-11-InlineStorageClassC99.c updated: 1.1 -> 1.2 2007-04-13-InlineAsmStruct2.c updated: 1.1 -> 1.2 2007-04-13-InlineAsmUnion2.c updated: 1.1 -> 1.2 bit-accurate-int.c updated: 1.2 -> 1.3 cast-to-bool.c updated: 1.3 -> 1.4 dg.exp updated: 1.4 -> 1.5 extern-weak.c updated: 1.4 -> 1.5 hidden-visibility.c updated: 1.1 -> 1.2 sret.c updated: 1.1 -> 1.2 --- Log message: For PR1319: http://llvm.org/PR1319 : Upgrade to new test harness. --- Diffs of the changes: (+74 -55) 2003-07-22-ArrayAccessTypeSafety.c.tr | 2 +- 2003-08-06-BuiltinSetjmpLongjmp.c.tr | 2 +- 2004-02-13-BuiltinFrameReturnAddress.c.tr | 2 +- 2004-11-27-InvalidConstantExpr.c | 2 +- 2004-11-27-StaticFunctionRedeclare.c | 3 ++- 2005-02-27-MarkGlobalConstant.c | 2 +- 2005-09-20-ComplexConstants.c | 1 - 2005-09-24-AsmUserPrefix.c | 4 +--- 2005-12-04-AttributeUsed.c | 3 ++- 2005-12-04-DeclarationLineNumbers.c | 2 +- 2006-01-16-BitCountIntrinsicsUnsigned.c | 3 +-- 2006-01-23-FileScopeAsm.c | 2 +- 2006-03-03-MissingInitializer.c | 2 +- 2006-09-28-SimpleAsm.c | 5 ++--- 2006-12-14-ordered_expr.c | 2 +- 2007-01-24-InlineAsmCModifier.c | 5 +++-- 2007-02-16-WritableStrings.c | 5 +++-- 2007-02-25-C-DotDotDot.c | 3 ++- 2007-03-05-DataLayout.c | 3 ++- 2007-04-11-InlineAsmStruct.c | 2 +- 2007-04-11-InlineAsmUnion.c | 2 +- 2007-04-11-InlineStorageClassC89.c | 23 ++++++++++++++++------- 2007-04-11-InlineStorageClassC99.c | 23 ++++++++++++++++------- 2007-04-13-InlineAsmStruct2.c | 2 +- 2007-04-13-InlineAsmUnion2.c | 2 +- bit-accurate-int.c | 3 +-- cast-to-bool.c | 5 +++-- dg.exp | 4 ++-- extern-weak.c | 4 ++-- hidden-visibility.c | 2 +- sret.c | 4 ++-- 31 files changed, 74 insertions(+), 55 deletions(-) Index: llvm/test/CFrontend/2003-07-22-ArrayAccessTypeSafety.c.tr diff -u llvm/test/CFrontend/2003-07-22-ArrayAccessTypeSafety.c.tr:1.3 llvm/test/CFrontend/2003-07-22-ArrayAccessTypeSafety.c.tr:1.4 --- llvm/test/CFrontend/2003-07-22-ArrayAccessTypeSafety.c.tr:1.3 Thu Nov 6 15:13:45 2003 +++ llvm/test/CFrontend/2003-07-22-ArrayAccessTypeSafety.c.tr Sun Apr 15 15:08:37 2007 @@ -1,4 +1,4 @@ -/* RUN: %llvmgcc -xc %s -c -o - | dis | not grep cast +/* RUN: %llvmgcc -xc %s -c -o - | llvm-dis | not grep cast */ void test(int* array, long long N) { Index: llvm/test/CFrontend/2003-08-06-BuiltinSetjmpLongjmp.c.tr diff -u llvm/test/CFrontend/2003-08-06-BuiltinSetjmpLongjmp.c.tr:1.2 llvm/test/CFrontend/2003-08-06-BuiltinSetjmpLongjmp.c.tr:1.3 --- llvm/test/CFrontend/2003-08-06-BuiltinSetjmpLongjmp.c.tr:1.2 Thu Nov 6 15:13:45 2003 +++ llvm/test/CFrontend/2003-08-06-BuiltinSetjmpLongjmp.c.tr Sun Apr 15 15:08:37 2007 @@ -1,4 +1,4 @@ -/* RUN: %llvmgcc -xc %s -c -o - | dis | not grep __builtin_ +/* RUN: %llvmgcc -xc %s -c -o - | llvm-dis | not grep __builtin_ * * __builtin_longjmp/setjmp should get transformed into llvm.setjmp/longjmp * just like explicit setjmp/longjmp calls are. Index: llvm/test/CFrontend/2004-02-13-BuiltinFrameReturnAddress.c.tr diff -u llvm/test/CFrontend/2004-02-13-BuiltinFrameReturnAddress.c.tr:1.1 llvm/test/CFrontend/2004-02-13-BuiltinFrameReturnAddress.c.tr:1.2 --- llvm/test/CFrontend/2004-02-13-BuiltinFrameReturnAddress.c.tr:1.1 Fri Feb 13 22:06:48 2004 +++ llvm/test/CFrontend/2004-02-13-BuiltinFrameReturnAddress.c.tr Sun Apr 15 15:08:37 2007 @@ -1,4 +1,4 @@ -// RUN: %llvmgcc -xc %s -c -o - | llvm-dis | grep 'llvm.*address' | wc -l | grep 4 +// RUN: %llvmgcc -xc %s -c -o - | llvm-dis | grep llvm.*address | wc -l | grep 4 void *test1() { return __builtin_return_address(1); Index: llvm/test/CFrontend/2004-11-27-InvalidConstantExpr.c diff -u llvm/test/CFrontend/2004-11-27-InvalidConstantExpr.c:1.1 llvm/test/CFrontend/2004-11-27-InvalidConstantExpr.c:1.2 --- llvm/test/CFrontend/2004-11-27-InvalidConstantExpr.c:1.1 Sat Nov 27 13:44:07 2004 +++ llvm/test/CFrontend/2004-11-27-InvalidConstantExpr.c Sun Apr 15 15:08:37 2007 @@ -1,4 +1,4 @@ -// RUN: %llvmgcc %s -S -o - | not grep 'foo\* sub' +// RUN: %llvmgcc %s -S -o - | not grep {foo\\* sub} // This should not produce a subtrace constantexpr of a pointer struct foo { int Y; Index: llvm/test/CFrontend/2004-11-27-StaticFunctionRedeclare.c diff -u llvm/test/CFrontend/2004-11-27-StaticFunctionRedeclare.c:1.1 llvm/test/CFrontend/2004-11-27-StaticFunctionRedeclare.c:1.2 --- llvm/test/CFrontend/2004-11-27-StaticFunctionRedeclare.c:1.1 Sat Nov 27 18:06:07 2004 +++ llvm/test/CFrontend/2004-11-27-StaticFunctionRedeclare.c Sun Apr 15 15:08:37 2007 @@ -1,4 +1,5 @@ -// RUN: %llvmgcc -S 2004-11-27-StaticFunctionRedeclare.c -o - | gccas | llvm-dis | not grep 'declare int.*func' +// RUN: %llvmgcc -c -emit-llvm 2004-11-27-StaticFunctionRedeclare.c -o - | \ +// RUN: opt -std-compile-opts | llvm-dis | not grep {declare int.*func} // There should not be an unresolved reference to func here. Believe it or not, // the "expected result" is a function named 'func' which is internal and Index: llvm/test/CFrontend/2005-02-27-MarkGlobalConstant.c diff -u llvm/test/CFrontend/2005-02-27-MarkGlobalConstant.c:1.2 llvm/test/CFrontend/2005-02-27-MarkGlobalConstant.c:1.3 --- llvm/test/CFrontend/2005-02-27-MarkGlobalConstant.c:1.2 Thu Apr 13 14:46:16 2006 +++ llvm/test/CFrontend/2005-02-27-MarkGlobalConstant.c Sun Apr 15 15:08:37 2007 @@ -1,4 +1,4 @@ -// RUN: %llvmgcc -xc %s -S -o - | grep 'internal constant ' +// RUN: %llvmgcc -xc %s -S -o - | grep {internal constant } // The synthetic global made by the CFE for big initializer should be marked // constant. Index: llvm/test/CFrontend/2005-09-20-ComplexConstants.c diff -u llvm/test/CFrontend/2005-09-20-ComplexConstants.c:1.1 llvm/test/CFrontend/2005-09-20-ComplexConstants.c:1.2 --- llvm/test/CFrontend/2005-09-20-ComplexConstants.c:1.1 Wed Sep 21 01:53:56 2005 +++ llvm/test/CFrontend/2005-09-20-ComplexConstants.c Sun Apr 15 15:08:37 2007 @@ -1,4 +1,3 @@ -// RUN: %llvmgcc %s -S -o - && \ // RUN: %llvmgcc %s -S -o - | llvm-as -o /dev/null -f const double _Complex x[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; Index: llvm/test/CFrontend/2005-09-24-AsmUserPrefix.c diff -u llvm/test/CFrontend/2005-09-24-AsmUserPrefix.c:1.2 llvm/test/CFrontend/2005-09-24-AsmUserPrefix.c:1.3 --- llvm/test/CFrontend/2005-09-24-AsmUserPrefix.c:1.2 Fri Feb 9 09:15:21 2007 +++ llvm/test/CFrontend/2005-09-24-AsmUserPrefix.c Sun Apr 15 15:08:37 2007 @@ -1,6 +1,4 @@ -// RUN: %llvmgcc %s -S -o - | llvm-as | opt -std-compile-opts && -// RUN: %llvmgcc %s -S -o - | llvm-as | opt -std-compile-opts | llc && -// RUN: %llvmgcc %s -S -o - | llvm-as | llc -std-compile-opts | llc | \ +// RUN: %llvmgcc %s -S -o - | llvm-as | opt -std-compile-opts | llc | \ // RUN: not grep _foo2 void foo() __asm__("foo2"); Index: llvm/test/CFrontend/2005-12-04-AttributeUsed.c diff -u llvm/test/CFrontend/2005-12-04-AttributeUsed.c:1.3 llvm/test/CFrontend/2005-12-04-AttributeUsed.c:1.4 --- llvm/test/CFrontend/2005-12-04-AttributeUsed.c:1.3 Fri Sep 29 12:34:56 2006 +++ llvm/test/CFrontend/2005-12-04-AttributeUsed.c Sun Apr 15 15:08:37 2007 @@ -1,4 +1,5 @@ -// RUN: %llvmgcc %s -S -emit-llvm -o - | llvm-as | llvm-dis | grep llvm.used | grep foo | grep X +// RUN: %llvmgcc %s -S -emit-llvm -o - | llvm-as | llvm-dis | \ +// RUN: grep llvm.used | grep foo | grep X int X __attribute__((used)); int Y; Index: llvm/test/CFrontend/2005-12-04-DeclarationLineNumbers.c diff -u llvm/test/CFrontend/2005-12-04-DeclarationLineNumbers.c:1.5 llvm/test/CFrontend/2005-12-04-DeclarationLineNumbers.c:1.6 --- llvm/test/CFrontend/2005-12-04-DeclarationLineNumbers.c:1.5 Sun Dec 31 00:01:59 2006 +++ llvm/test/CFrontend/2005-12-04-DeclarationLineNumbers.c Sun Apr 15 15:08:37 2007 @@ -1,4 +1,4 @@ -// RUN: %llvmgcc %s -S -g -o - | grep 'llvm.dbg.stoppoint.*i32 14' +// RUN: %llvmgcc %s -S -g -o - | grep {llvm.dbg.stoppoint.*i32 14} // PR664: ensure that line #'s are emitted for declarations Index: llvm/test/CFrontend/2006-01-16-BitCountIntrinsicsUnsigned.c diff -u llvm/test/CFrontend/2006-01-16-BitCountIntrinsicsUnsigned.c:1.2 llvm/test/CFrontend/2006-01-16-BitCountIntrinsicsUnsigned.c:1.3 --- llvm/test/CFrontend/2006-01-16-BitCountIntrinsicsUnsigned.c:1.2 Sun Dec 31 00:01:59 2006 +++ llvm/test/CFrontend/2006-01-16-BitCountIntrinsicsUnsigned.c Sun Apr 15 15:08:37 2007 @@ -1,5 +1,4 @@ -// RUN: %llvmgcc -S %s -o - | grep 'llvm.ctlz.i32(i32' -// RUNMEIFWEHADSIGNEDTYPES: %llvmgcc -S %s -o - | not grep 'llvm.ctlz.i32(i32' +// RUN: %llvmgcc -S %s -o - | grep {llvm.ctlz.i32(i32} | wc -l | grep 2 unsigned t2(unsigned X) { return __builtin_clz(X); Index: llvm/test/CFrontend/2006-01-23-FileScopeAsm.c diff -u llvm/test/CFrontend/2006-01-23-FileScopeAsm.c:1.4 llvm/test/CFrontend/2006-01-23-FileScopeAsm.c:1.5 --- llvm/test/CFrontend/2006-01-23-FileScopeAsm.c:1.4 Fri Feb 9 09:15:21 2007 +++ llvm/test/CFrontend/2006-01-23-FileScopeAsm.c Sun Apr 15 15:08:37 2007 @@ -1,5 +1,5 @@ // RUN: %llvmgcc %s -S -o - | llvm-as | opt -std-compile-opts | \ -// RUN: llvm-dis | grep foo[12345] | wc -l | grep 5 +// RUN: llvm-dis | grep {foo\[12345\]} | wc -l | grep 5 __asm__ ("foo1"); __asm__ ("foo2"); Index: llvm/test/CFrontend/2006-03-03-MissingInitializer.c diff -u llvm/test/CFrontend/2006-03-03-MissingInitializer.c:1.3 llvm/test/CFrontend/2006-03-03-MissingInitializer.c:1.4 --- llvm/test/CFrontend/2006-03-03-MissingInitializer.c:1.3 Fri Feb 9 09:15:21 2007 +++ llvm/test/CFrontend/2006-03-03-MissingInitializer.c Sun Apr 15 15:08:37 2007 @@ -1,5 +1,5 @@ // RUN: %llvmgcc %s -S -o - | llvm-as | opt -std-compile-opts | \ -// RUN: llvm-dis | grep '@nate.*internal global i32 0' +// RUN: llvm-dis | grep [EMAIL PROTECTED] global i32 0} struct X { int *XX; int Y;}; Index: llvm/test/CFrontend/2006-09-28-SimpleAsm.c diff -u llvm/test/CFrontend/2006-09-28-SimpleAsm.c:1.3 llvm/test/CFrontend/2006-09-28-SimpleAsm.c:1.4 --- llvm/test/CFrontend/2006-09-28-SimpleAsm.c:1.3 Wed Feb 7 22:31:15 2007 +++ llvm/test/CFrontend/2006-09-28-SimpleAsm.c Sun Apr 15 15:08:37 2007 @@ -1,6 +1,5 @@ -// RUN: %llvmgcc %s -S -o /dev/null && -// RUN: %llvmgcc %s -S -o - | grep 'ext: xorl %eax, eax; movl' && -// RUN: %llvmgcc %s -S -o - | grep 'nonext: xorl %eax, %eax; mov' +// RUN: %llvmgcc %s -S -o - | grep {ext: xorl %eax, eax; movl} +// RUN: %llvmgcc %s -S -o - | grep {nonext: xorl %eax, %eax; mov} // PR924 void bar() { Index: llvm/test/CFrontend/2006-12-14-ordered_expr.c diff -u llvm/test/CFrontend/2006-12-14-ordered_expr.c:1.2 llvm/test/CFrontend/2006-12-14-ordered_expr.c:1.3 --- llvm/test/CFrontend/2006-12-14-ordered_expr.c:1.2 Sat Dec 23 00:05:41 2006 +++ llvm/test/CFrontend/2006-12-14-ordered_expr.c Sun Apr 15 15:08:37 2007 @@ -1,4 +1,4 @@ -// RUN: %llvmgcc -O3 -S %s -o - | grep 'fcmp ord float %X, %Y' +// RUN: %llvmgcc -O3 -S %s -o - | grep {fcmp ord float %X, %Y} int test2(float X, float Y) { return !__builtin_isunordered(X, Y); Index: llvm/test/CFrontend/2007-01-24-InlineAsmCModifier.c diff -u llvm/test/CFrontend/2007-01-24-InlineAsmCModifier.c:1.1 llvm/test/CFrontend/2007-01-24-InlineAsmCModifier.c:1.2 --- llvm/test/CFrontend/2007-01-24-InlineAsmCModifier.c:1.1 Wed Jan 24 20:52:33 2007 +++ llvm/test/CFrontend/2007-01-24-InlineAsmCModifier.c Sun Apr 15 15:08:37 2007 @@ -1,5 +1,6 @@ -// Verify that the %c modifier works and strips off any prefixes from immediates. -// RUN: %llvmgcc -S %s -o - | llvm-as | llc | grep 'pickANumber: 789514' +// Verify that the %c modifier works and strips off any prefixes from +// immediates. +// RUN: %llvmgcc -S %s -o - | llvm-as | llc | grep {pickANumber: 789514} void foo() { __asm__ volatile("/* " "pickANumber" ": %c0 */"::"i"(0xC0C0A)); Index: llvm/test/CFrontend/2007-02-16-WritableStrings.c diff -u llvm/test/CFrontend/2007-02-16-WritableStrings.c:1.1 llvm/test/CFrontend/2007-02-16-WritableStrings.c:1.2 --- llvm/test/CFrontend/2007-02-16-WritableStrings.c:1.1 Fri Feb 16 23:07:40 2007 +++ llvm/test/CFrontend/2007-02-16-WritableStrings.c Sun Apr 15 15:08:37 2007 @@ -1,7 +1,8 @@ // Test the -fwritable-strings option. -// RUN: %llvmgcc -O3 -S -o - -emit-llvm -fwritable-strings %s | grep 'internal global' && -// RUN: %llvmgcc -O3 -S -o - -emit-llvm %s | grep 'internal constant' +// RUN: %llvmgcc -O3 -S -o - -emit-llvm -fwritable-strings %s | \ +// RUN: grep {internal global} +// RUN: %llvmgcc -O3 -S -o - -emit-llvm %s | grep {internal constant} char *X = "foo"; Index: llvm/test/CFrontend/2007-02-25-C-DotDotDot.c diff -u llvm/test/CFrontend/2007-02-25-C-DotDotDot.c:1.1 llvm/test/CFrontend/2007-02-25-C-DotDotDot.c:1.2 --- llvm/test/CFrontend/2007-02-25-C-DotDotDot.c:1.1 Sun Feb 25 16:02:01 2007 +++ llvm/test/CFrontend/2007-02-25-C-DotDotDot.c Sun Apr 15 15:08:37 2007 @@ -1,4 +1,5 @@ -// RUN: %llvmgcc -O0 -S -o - -emit-llvm -fno-inline -fno-unit-at-a-time %s | grep 'call float @foo' +// RUN: %llvmgcc -O0 -S -o - -emit-llvm -fno-inline -fno-unit-at-a-time %s | \ +// RUN: grep {call float @foo} // Make sure the call to foo is compiled as: // call float @foo() Index: llvm/test/CFrontend/2007-03-05-DataLayout.c diff -u llvm/test/CFrontend/2007-03-05-DataLayout.c:1.4 llvm/test/CFrontend/2007-03-05-DataLayout.c:1.5 --- llvm/test/CFrontend/2007-03-05-DataLayout.c:1.4 Tue Mar 6 18:39:11 2007 +++ llvm/test/CFrontend/2007-03-05-DataLayout.c Sun Apr 15 15:08:37 2007 @@ -1,6 +1,7 @@ // Testcase for PR1242 // RUN: %llvmgcc -S %s -o - | grep datalayout | \ -// RUN: not grep '"[Ee]-p:[36][24]:[36][24]"' +// RUN: not grep {"\[Ee\]-p:\[36\]\[24\]:\[36\]\[24\]"} +// END. #include <stdlib.h> #define NDIM 3 #define BODY 01 Index: llvm/test/CFrontend/2007-04-11-InlineAsmStruct.c diff -u llvm/test/CFrontend/2007-04-11-InlineAsmStruct.c:1.1 llvm/test/CFrontend/2007-04-11-InlineAsmStruct.c:1.2 --- llvm/test/CFrontend/2007-04-11-InlineAsmStruct.c:1.1 Wed Apr 11 18:45:16 2007 +++ llvm/test/CFrontend/2007-04-11-InlineAsmStruct.c Sun Apr 15 15:08:37 2007 @@ -1,4 +1,4 @@ -// RUN: %llvmgcc %s -S -emit-llvm -o - | grep 'call i32 asm' +// RUN: %llvmgcc %s -S -emit-llvm -o - | grep {call i32 asm} struct V { short X, Y; }; int bar() { Index: llvm/test/CFrontend/2007-04-11-InlineAsmUnion.c diff -u llvm/test/CFrontend/2007-04-11-InlineAsmUnion.c:1.2 llvm/test/CFrontend/2007-04-11-InlineAsmUnion.c:1.3 --- llvm/test/CFrontend/2007-04-11-InlineAsmUnion.c:1.2 Wed Apr 11 18:45:16 2007 +++ llvm/test/CFrontend/2007-04-11-InlineAsmUnion.c Sun Apr 15 15:08:37 2007 @@ -1,4 +1,4 @@ -// RUN: %llvmgcc %s -S -emit-llvm -o - | grep 'call i32 asm' +// RUN: %llvmgcc %s -S -emit-llvm -o - | grep {call i32 asm} union U { int x; char* p; }; void foo() { Index: llvm/test/CFrontend/2007-04-11-InlineStorageClassC89.c diff -u llvm/test/CFrontend/2007-04-11-InlineStorageClassC89.c:1.1 llvm/test/CFrontend/2007-04-11-InlineStorageClassC89.c:1.2 --- llvm/test/CFrontend/2007-04-11-InlineStorageClassC89.c:1.1 Thu Apr 12 16:01:53 2007 +++ llvm/test/CFrontend/2007-04-11-InlineStorageClassC89.c Sun Apr 15 15:08:37 2007 @@ -1,10 +1,19 @@ -// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | grep xglobWeak | grep weak | wc -l | grep 1 -// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | grep xextWeak | grep weak | wc -l | grep 1 -// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | grep xWeaknoinline | grep weak wc -l | grep 1 -// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | grep xWeakextnoinline | grep weak wc -l | grep 1 -// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | grep xglobnoWeak | grep -v internal | grep -v weak | grep -v linkonce | wc -l | grep 1 -// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | grep xstatnoWeak | grep internal | wc -l | grep 1 -// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep declare | grep xextnoWeak | grep -v internal | grep -v weak | grep -v linkonce | wc -l | grep 1 +// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | grep xglobWeak | \ +// RUN: grep weak | wc -l | grep 1 +// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | grep xextWeak | \ +// RUN: grep weak | wc -l | grep 1 +// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | \ +// RUN: grep xWeaknoinline | grep weak | wc -l | grep 1 +// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | \ +// RUN: grep xWeakextnoinline | grep weak | wc -l | grep 1 +// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | \ +// RUN: grep xglobnoWeak | grep -v internal | grep -v weak | \ +// RUN: grep -v linkonce | wc -l | grep 1 +// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep define | \ +// RUN: grep xstatnoWeak | grep internal | wc -l | grep 1 +// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep declare | \ +// RUN: grep xextnoWeak | grep -v internal | grep -v weak | \ +// RUN: grep -v linkonce | wc -l | grep 1 inline int xglobWeak(int) __attribute__((weak)); inline int xglobWeak (int i) { return i*2; Index: llvm/test/CFrontend/2007-04-11-InlineStorageClassC99.c diff -u llvm/test/CFrontend/2007-04-11-InlineStorageClassC99.c:1.1 llvm/test/CFrontend/2007-04-11-InlineStorageClassC99.c:1.2 --- llvm/test/CFrontend/2007-04-11-InlineStorageClassC99.c:1.1 Thu Apr 12 16:01:53 2007 +++ llvm/test/CFrontend/2007-04-11-InlineStorageClassC99.c Sun Apr 15 15:08:37 2007 @@ -1,10 +1,19 @@ -// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep declare | grep xglobWeak | grep extern_weak | wc -l | grep 1 -// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | grep xextWeak | grep weak | wc -l | grep 1 -// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | grep xWeaknoinline | grep weak wc -l | grep 1 -// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | grep xWeakextnoinline | grep weak wc -l | grep 1 -// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep declare | grep xglobnoWeak | grep -v internal | grep -v weak | grep -v linkonce | wc -l | grep 1 -// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | grep xstatnoWeak | grep internal | wc -l | grep 1 -// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | grep xextnoWeak | grep -v internal | grep -v weak | grep -v linkonce | wc -l | grep 1 +// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep declare | \ +// RUN: grep xglobWeak | grep extern_weak | wc -l | grep 1 +// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \ +// RUN: grep xextWeak | grep weak | wc -l | grep 1 +// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \ +// RUN: grep xWeaknoinline | grep weak | wc -l | grep 1 +// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \ +// RUN: grep xWeakextnoinline | grep weak | wc -l | grep 1 +// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep declare | \ +// RUN: grep xglobnoWeak | grep -v internal | grep -v weak | \ +// RUN: grep -v linkonce | wc -l | grep 1 +// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \ +// RUN: grep xstatnoWeak | grep internal | wc -l | grep 1 +// RUN: %llvmgcc -std=c99 %s -S -emit-llvm -O0 -o - | grep define | \ +// RUN: grep xextnoWeak | grep -v internal | grep -v weak | \ +// RUN: grep -v linkonce | wc -l | grep 1 inline int xglobWeak(int) __attribute__((weak)); inline int xglobWeak (int i) { return i*2; Index: llvm/test/CFrontend/2007-04-13-InlineAsmStruct2.c diff -u llvm/test/CFrontend/2007-04-13-InlineAsmStruct2.c:1.1 llvm/test/CFrontend/2007-04-13-InlineAsmStruct2.c:1.2 --- llvm/test/CFrontend/2007-04-13-InlineAsmStruct2.c:1.1 Fri Apr 13 17:54:11 2007 +++ llvm/test/CFrontend/2007-04-13-InlineAsmStruct2.c Sun Apr 15 15:08:37 2007 @@ -1,4 +1,4 @@ -// RUN: %llvmgcc %s -S -emit-llvm -o - | grep 'call void asm' +// RUN: %llvmgcc %s -S -emit-llvm -o - | grep {call void asm} struct V { short X, Y; }; int bar() { Index: llvm/test/CFrontend/2007-04-13-InlineAsmUnion2.c diff -u llvm/test/CFrontend/2007-04-13-InlineAsmUnion2.c:1.1 llvm/test/CFrontend/2007-04-13-InlineAsmUnion2.c:1.2 --- llvm/test/CFrontend/2007-04-13-InlineAsmUnion2.c:1.1 Fri Apr 13 17:54:11 2007 +++ llvm/test/CFrontend/2007-04-13-InlineAsmUnion2.c Sun Apr 15 15:08:37 2007 @@ -1,4 +1,4 @@ -// RUN: %llvmgcc %s -S -emit-llvm -o - | grep 'call void asm' +// RUN: %llvmgcc %s -S -emit-llvm -o - | grep {call void asm} union U { int x; char* p; }; void foo() { Index: llvm/test/CFrontend/bit-accurate-int.c diff -u llvm/test/CFrontend/bit-accurate-int.c:1.2 llvm/test/CFrontend/bit-accurate-int.c:1.3 --- llvm/test/CFrontend/bit-accurate-int.c:1.2 Fri Jan 19 15:06:38 2007 +++ llvm/test/CFrontend/bit-accurate-int.c Sun Apr 15 15:08:37 2007 @@ -1,5 +1,4 @@ -// RUN: %llvmgcc -S %s -o - /dev/null 2>&1 > /dev/null | \ -// RUN: not grep warning +// RUN: ignore %llvmgcc -S %s -o - /dev/null |& not grep warning // XFAIL: * #define ATTR_BITS(N) __attribute__((bitwidth(N))) Index: llvm/test/CFrontend/cast-to-bool.c diff -u llvm/test/CFrontend/cast-to-bool.c:1.3 llvm/test/CFrontend/cast-to-bool.c:1.4 --- llvm/test/CFrontend/cast-to-bool.c:1.3 Tue Jan 23 11:49:33 2007 +++ llvm/test/CFrontend/cast-to-bool.c Sun Apr 15 15:08:37 2007 @@ -1,5 +1,6 @@ -// RUN: %llvmgcc -S %s -o - | grep 'trunc.*to bool' -// RUN: %llvmgcc -S %s -o - | llvm-as | opt -instcombine | llc -march=x86 | grep 'test.*1' +// RUN: %llvmgcc -S %s -o - | grep {trunc.*to i8} +// RUN: %llvmgcc -S %s -o - | llvm-as | opt -instcombine | llc -march=x86 | \ +// RUN: grep {test.*1} int main ( int argc, char** argv) { Index: llvm/test/CFrontend/dg.exp diff -u llvm/test/CFrontend/dg.exp:1.4 llvm/test/CFrontend/dg.exp:1.5 --- llvm/test/CFrontend/dg.exp:1.4 Wed Apr 11 14:56:57 2007 +++ llvm/test/CFrontend/dg.exp Sun Apr 15 15:08:37 2007 @@ -1,3 +1,3 @@ -load_lib llvm-dg.exp +load_lib llvm.exp -llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] +RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] Index: llvm/test/CFrontend/extern-weak.c diff -u llvm/test/CFrontend/extern-weak.c:1.4 llvm/test/CFrontend/extern-weak.c:1.5 --- llvm/test/CFrontend/extern-weak.c:1.4 Wed Apr 4 17:07:44 2007 +++ llvm/test/CFrontend/extern-weak.c Sun Apr 15 15:08:37 2007 @@ -1,5 +1,5 @@ -// RUN: %llvmgcc -O3 -S -o - -emit-llvm %s | grep extern_weak && -// RUN: %llvmgcc -O3 -S -o - -emit-llvm | llvm-as | llc +// RUN: %llvmgcc -O3 -S -o - -emit-llvm %s | grep extern_weak +// RUN: %llvmgcc -O3 -S -o - -emit-llvm %s | llvm-as | llc #if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) void foo() __attribute__((weak_import)); Index: llvm/test/CFrontend/hidden-visibility.c diff -u llvm/test/CFrontend/hidden-visibility.c:1.1 llvm/test/CFrontend/hidden-visibility.c:1.2 --- llvm/test/CFrontend/hidden-visibility.c:1.1 Sun Jan 14 12:57:37 2007 +++ llvm/test/CFrontend/hidden-visibility.c Sun Apr 15 15:08:37 2007 @@ -1,3 +1,3 @@ -// RUN: %llvmgcc %s -emit-llvm -S -o - | grep 'hidden global' +// RUN: %llvmgcc %s -emit-llvm -S -o - | grep {hidden global} int X __attribute__ ((__visibility__ ("hidden"))) = 123; Index: llvm/test/CFrontend/sret.c diff -u llvm/test/CFrontend/sret.c:1.1 llvm/test/CFrontend/sret.c:1.2 --- llvm/test/CFrontend/sret.c:1.1 Sun Apr 1 17:03:04 2007 +++ llvm/test/CFrontend/sret.c Sun Apr 15 15:08:37 2007 @@ -1,4 +1,4 @@ -// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep 'sret' | wc -l | grep '5' +// RUN: %llvmgcc %s -S -emit-llvm -O0 -o - | grep sret | wc -l | grep 5 struct abc { int a; @@ -12,4 +12,4 @@ void bar() { struct abc dummy1 = foo1(); struct abc dummy2 = foo2(); -} \ No newline at end of file +} _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits