[llvm-commits] CVS: llvm/test/C++Frontend/2003-10-21-InnerClass.cpp.tr 2003-11-09-ConstructorTypeSafety.cpp.tr 2003-11-18-MemberInitializationCasting.cpp.tr 2004-01-11-DynamicInitializedConstant.cpp.tr 2004-09-27-CompilerCrash.cpp 2004-09-27-DidntEmitTemplate.cpp.tr 2004-11-27-EmitsUnusedInlineFunctions.cpp 2005-02-14-BitFieldOffset.cpp 2006-09-27-Debug-Protection.cpp 2007-03-27-FunctionVarRename.cpp 2007-04-11-InlineStorageClassC++.cpp dg.exp
Reid Spencer
reid at x10sys.com
Sun Apr 15 13:42:01 PDT 2007
Changes in directory llvm/test/C++Frontend:
2003-10-21-InnerClass.cpp.tr updated: 1.1 -> 1.2
2003-11-09-ConstructorTypeSafety.cpp.tr updated: 1.2 -> 1.3
2003-11-18-MemberInitializationCasting.cpp.tr updated: 1.2 -> 1.3
2004-01-11-DynamicInitializedConstant.cpp.tr updated: 1.1 -> 1.2
2004-09-27-CompilerCrash.cpp updated: 1.2 -> 1.3
2004-09-27-DidntEmitTemplate.cpp.tr updated: 1.1 -> 1.2
2004-11-27-EmitsUnusedInlineFunctions.cpp updated: 1.1 -> 1.2
2005-02-14-BitFieldOffset.cpp updated: 1.1 -> 1.2
2006-09-27-Debug-Protection.cpp updated: 1.3 -> 1.4
2007-03-27-FunctionVarRename.cpp updated: 1.2 -> 1.3
2007-04-11-InlineStorageClassC++.cpp updated: 1.1 -> 1.2
dg.exp updated: 1.4 -> 1.5
---
Log message:
For PR1319: http://llvm.org/PR1319 : Upgrade to new test harness.
---
Diffs of the changes: (+29 -22)
2003-10-21-InnerClass.cpp.tr | 2 +-
2003-11-09-ConstructorTypeSafety.cpp.tr | 3 ++-
2003-11-18-MemberInitializationCasting.cpp.tr | 2 +-
2004-01-11-DynamicInitializedConstant.cpp.tr | 2 +-
2004-09-27-CompilerCrash.cpp | 2 --
2004-09-27-DidntEmitTemplate.cpp.tr | 3 ++-
2004-11-27-EmitsUnusedInlineFunctions.cpp | 2 +-
2005-02-14-BitFieldOffset.cpp | 2 +-
2006-09-27-Debug-Protection.cpp | 4 ++--
2007-03-27-FunctionVarRename.cpp | 4 ++--
2007-04-11-InlineStorageClassC++.cpp | 21 ++++++++++++++-------
dg.exp | 4 ++--
12 files changed, 29 insertions(+), 22 deletions(-)
Index: llvm/test/C++Frontend/2003-10-21-InnerClass.cpp.tr
diff -u llvm/test/C++Frontend/2003-10-21-InnerClass.cpp.tr:1.1 llvm/test/C++Frontend/2003-10-21-InnerClass.cpp.tr:1.2
--- llvm/test/C++Frontend/2003-10-21-InnerClass.cpp.tr:1.1 Tue Oct 21 16:33:18 2003
+++ llvm/test/C++Frontend/2003-10-21-InnerClass.cpp.tr Sun Apr 15 15:41:31 2007
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -xc++ -S -o - %s | grep '"struct.X::Y"'
+// RUN: %llvmgcc -xc++ -S -o - %s | grep "struct.X::Y"
struct X {
struct Y {
Index: llvm/test/C++Frontend/2003-11-09-ConstructorTypeSafety.cpp.tr
diff -u llvm/test/C++Frontend/2003-11-09-ConstructorTypeSafety.cpp.tr:1.2 llvm/test/C++Frontend/2003-11-09-ConstructorTypeSafety.cpp.tr:1.3
--- llvm/test/C++Frontend/2003-11-09-ConstructorTypeSafety.cpp.tr:1.2 Thu Apr 13 12:26:54 2006
+++ llvm/test/C++Frontend/2003-11-09-ConstructorTypeSafety.cpp.tr Sun Apr 15 15:41:31 2007
@@ -1,5 +1,6 @@
// The code generated for this testcase should be completely typesafe!
-// RUN: %llvmgcc -xc++ -S -o - %s | llvm-as | opt -die | llvm-dis | not grep ' cast '
+// RUN: %llvmgcc -xc++ -S -o - %s | llvm-as | opt -die | llvm-dis | \
+// RUN: notcast
struct contained {
unsigned X;
Index: llvm/test/C++Frontend/2003-11-18-MemberInitializationCasting.cpp.tr
diff -u llvm/test/C++Frontend/2003-11-18-MemberInitializationCasting.cpp.tr:1.2 llvm/test/C++Frontend/2003-11-18-MemberInitializationCasting.cpp.tr:1.3
--- llvm/test/C++Frontend/2003-11-18-MemberInitializationCasting.cpp.tr:1.2 Thu Apr 13 12:26:54 2006
+++ llvm/test/C++Frontend/2003-11-18-MemberInitializationCasting.cpp.tr Sun Apr 15 15:41:31 2007
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -xc++ -S -o - %s | llvm-as | opt -die | llvm-dis | not grep ' cast '
+// RUN: %llvmgcc -xc++ -S -o - %s | llvm-as | opt -die | llvm-dis | notcast
struct A {
A() : i(0) {}
Index: llvm/test/C++Frontend/2004-01-11-DynamicInitializedConstant.cpp.tr
diff -u llvm/test/C++Frontend/2004-01-11-DynamicInitializedConstant.cpp.tr:1.1 llvm/test/C++Frontend/2004-01-11-DynamicInitializedConstant.cpp.tr:1.2
--- llvm/test/C++Frontend/2004-01-11-DynamicInitializedConstant.cpp.tr:1.1 Sun Jan 11 23:01:48 2004
+++ llvm/test/C++Frontend/2004-01-11-DynamicInitializedConstant.cpp.tr Sun Apr 15 15:41:31 2007
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -xc++ -S -o - %s | not grep ' constant '
+// RUN: %llvmgcc -xc++ -S -o - %s | not grep { constant }
extern int X;
const int Y = X;
Index: llvm/test/C++Frontend/2004-09-27-CompilerCrash.cpp
diff -u llvm/test/C++Frontend/2004-09-27-CompilerCrash.cpp:1.2 llvm/test/C++Frontend/2004-09-27-CompilerCrash.cpp:1.3
--- llvm/test/C++Frontend/2004-09-27-CompilerCrash.cpp:1.2 Sat Nov 6 16:29:57 2004
+++ llvm/test/C++Frontend/2004-09-27-CompilerCrash.cpp Sun Apr 15 15:41:31 2007
@@ -1,7 +1,5 @@
// RUN: %llvmgxx -S %s -o - | llvm-as -f -o /dev/null
-
-
struct Pass {} ;
template<typename PassName>
Pass *callDefaultCtor() { return new PassName(); }
Index: llvm/test/C++Frontend/2004-09-27-DidntEmitTemplate.cpp.tr
diff -u llvm/test/C++Frontend/2004-09-27-DidntEmitTemplate.cpp.tr:1.1 llvm/test/C++Frontend/2004-09-27-DidntEmitTemplate.cpp.tr:1.2
--- llvm/test/C++Frontend/2004-09-27-DidntEmitTemplate.cpp.tr:1.1 Tue Nov 30 12:25:12 2004
+++ llvm/test/C++Frontend/2004-09-27-DidntEmitTemplate.cpp.tr Sun Apr 15 15:41:31 2007
@@ -1,4 +1,5 @@
-// RUN: llvmgcc -xc++ %s -c -o - | llvm-dis | grep callDefaultCtor | not grep declare
+// RUN: %llvmgxx -xc++ %s -c -o - | llvm-dis | grep callDefaultCtor | \
+// RUN: not grep declare
// This is a testcase for LLVM PR445, which was a problem where the
// instantiation of callDefaultCtor was not being emitted correctly.
Index: llvm/test/C++Frontend/2004-11-27-EmitsUnusedInlineFunctions.cpp
diff -u llvm/test/C++Frontend/2004-11-27-EmitsUnusedInlineFunctions.cpp:1.1 llvm/test/C++Frontend/2004-11-27-EmitsUnusedInlineFunctions.cpp:1.2
--- llvm/test/C++Frontend/2004-11-27-EmitsUnusedInlineFunctions.cpp:1.1 Sat Nov 27 14:31:59 2004
+++ llvm/test/C++Frontend/2004-11-27-EmitsUnusedInlineFunctions.cpp Sun Apr 15 15:41:31 2007
@@ -2,6 +2,6 @@
// verifies that it does not emit the body of getchar, because it is not used.
// This corresponds to PR459
-// RUN: %llvmgxx %s -S -o - | not grep '^int .getchar'
+// RUN: %llvmgxx %s -S -o - | not grep {^i32 .getchar}
#include <stdio.h>
Index: llvm/test/C++Frontend/2005-02-14-BitFieldOffset.cpp
diff -u llvm/test/C++Frontend/2005-02-14-BitFieldOffset.cpp:1.1 llvm/test/C++Frontend/2005-02-14-BitFieldOffset.cpp:1.2
--- llvm/test/C++Frontend/2005-02-14-BitFieldOffset.cpp:1.1 Mon Feb 14 23:18:05 2005
+++ llvm/test/C++Frontend/2005-02-14-BitFieldOffset.cpp Sun Apr 15 15:41:31 2007
@@ -1,4 +1,4 @@
-// RUN: %llvmgxx %s -S -o - | not grep 'int 6'
+// RUN: %llvmgxx %s -S -o - | not grep {i32 6}
struct QVectorTypedData {
int size;
Index: llvm/test/C++Frontend/2006-09-27-Debug-Protection.cpp
diff -u llvm/test/C++Frontend/2006-09-27-Debug-Protection.cpp:1.3 llvm/test/C++Frontend/2006-09-27-Debug-Protection.cpp:1.4
--- llvm/test/C++Frontend/2006-09-27-Debug-Protection.cpp:1.3 Sun Dec 31 00:01:59 2006
+++ llvm/test/C++Frontend/2006-09-27-Debug-Protection.cpp Sun Apr 15 15:41:31 2007
@@ -1,6 +1,6 @@
// XFAIL: llvmgcc3
-// RUN: %llvmgxx -O0 -emit-llvm -S -g -o - %s | grep 'i32 1,' &&
-// RUN: %llvmgxx -O0 -emit-llvm -S -g -o - %s | grep 'i32 2,'
+// RUN: %llvmgxx -O0 -emit-llvm -S -g -o - %s | grep {i32 1,}
+// RUN: %llvmgxx -O0 -emit-llvm -S -g -o - %s | grep {i32 2,}
class A {
public:
Index: llvm/test/C++Frontend/2007-03-27-FunctionVarRename.cpp
diff -u llvm/test/C++Frontend/2007-03-27-FunctionVarRename.cpp:1.2 llvm/test/C++Frontend/2007-03-27-FunctionVarRename.cpp:1.3
--- llvm/test/C++Frontend/2007-03-27-FunctionVarRename.cpp:1.2 Sun Apr 1 01:19:41 2007
+++ llvm/test/C++Frontend/2007-03-27-FunctionVarRename.cpp Sun Apr 15 15:41:31 2007
@@ -1,5 +1,5 @@
-// RUN: %llvmgxx %s -emit-llvm -S -o - | not grep 'eprintf1' &&
-// RUN: %llvmgxx %s -emit-llvm -S -o - | grep 'eprintf'
+// RUN: %llvmgxx %s -emit-llvm -S -o - | not grep eprintf1
+// RUN: %llvmgxx %s -emit-llvm -S -o - | grep eprintf
// Only one eprintf should exist in the output
Index: llvm/test/C++Frontend/2007-04-11-InlineStorageClassC++.cpp
diff -u llvm/test/C++Frontend/2007-04-11-InlineStorageClassC++.cpp:1.1 llvm/test/C++Frontend/2007-04-11-InlineStorageClassC++.cpp:1.2
--- llvm/test/C++Frontend/2007-04-11-InlineStorageClassC++.cpp:1.1 Thu Apr 12 16:01:53 2007
+++ llvm/test/C++Frontend/2007-04-11-InlineStorageClassC++.cpp Sun Apr 15 15:41:31 2007
@@ -1,10 +1,17 @@
-// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | grep xglobWeak | grep linkonce | wc -l | grep 1
-// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | grep xextWeak | grep linkonce | wc -l | grep 1
-// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | grep xWeaknoinline | grep weak wc -l | grep 1
-// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | grep xWeakextnoinline | grep weak wc -l | grep 1
-// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep declare | grep xglobnoWeak | grep linkonce | wc -l | grep 1
-// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | grep xstatnoWeak | grep internal | wc -l | grep 1
-// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | grep xextnoWeak | grep linkonce | wc -l | grep 1
+// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | \
+// RUN: grep xglobWeak | grep linkonce | wc -l | grep 1
+// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | \
+// RUN: grep xextWeak | grep linkonce | wc -l | grep 1
+// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | \
+// RUN: grep xWeaknoinline | grep weak | wc -l | grep 1
+// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | \
+// RUN: grep xWeakextnoinline | grep weak | wc -l | grep 1
+// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep declare | \
+// RUN: grep xglobnoWeak | grep linkonce | wc -l | grep 1
+// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | \
+// RUN: grep xstatnoWeak | grep internal | wc -l | grep 1
+// RUN: %llvmgxx %s -S -emit-llvm -O0 -o - | grep define | \
+// RUN: grep xextnoWeak | grep linkonce | wc -l | grep 1
inline int xglobWeak(int) __attribute__((weak));
inline int xglobWeak (int i) {
return i*2;
Index: llvm/test/C++Frontend/dg.exp
diff -u llvm/test/C++Frontend/dg.exp:1.4 llvm/test/C++Frontend/dg.exp:1.5
--- llvm/test/C++Frontend/dg.exp:1.4 Wed Apr 11 14:56:57 2007
+++ llvm/test/C++Frontend/dg.exp Sun Apr 15 15:41:31 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}]]
More information about the llvm-commits
mailing list