[llvm-commits] CVS: llvm/test/Feature/dg.exp globalredefinition2.ll globalredefinition3.ll packed_struct.ll

[Reid Spencer]

Changes in directory llvm/test/Feature:

dg.exp updated: 1.6 -> 1.7
globalredefinition2.ll updated: 1.2 -> 1.3
globalredefinition3.ll updated: 1.3 -> 1.4
packed_struct.ll updated: 1.6 -> 1.7
---
Log message:

For PR1319: http://llvm.org/PR1319 :
Changes necessary for conversion of this directory to run the tests
under the llvm.exp version of llvm_runtest


---
Diffs of the changes:  (+8 -9)

 dg.exp                 |    2 +-
 globalredefinition2.ll |    2 +-
 globalredefinition3.ll |    6 ++----
 packed_struct.ll       |    7 ++++---
 4 files changed, 8 insertions(+), 9 deletions(-)


Index: llvm/test/Feature/dg.exp
diff -u llvm/test/Feature/dg.exp:1.6 llvm/test/Feature/dg.exp:1.7
--- llvm/test/Feature/dg.exp:1.6	Wed Apr 11 14:56:58 2007
+++ llvm/test/Feature/dg.exp	Sat Apr 14 11:40:08 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}]]


Index: llvm/test/Feature/globalredefinition2.ll
diff -u llvm/test/Feature/globalredefinition2.ll:1.2 llvm/test/Feature/globalredefinition2.ll:1.3
--- llvm/test/Feature/globalredefinition2.ll:1.2	Fri Jan 26 02:25:06 2007
+++ llvm/test/Feature/globalredefinition2.ll	Sat Apr 14 11:40:08 2007
@@ -1,5 +1,5 @@
 ; Test that redefinitions of globals produces an error in llvm-upgrade
-; RUN: llvm-upgrade < %s -o /dev/null -f 2>&1 | \
+; RUN: llvm-upgrade < %s -o /dev/null -f |& \
 ; RUN:   grep "Renaming global variable 'B' to.*linkage errors"
 
 %B = global int 7


Index: llvm/test/Feature/globalredefinition3.ll
diff -u llvm/test/Feature/globalredefinition3.ll:1.3 llvm/test/Feature/globalredefinition3.ll:1.4
--- llvm/test/Feature/globalredefinition3.ll:1.3	Fri Jan 26 02:25:06 2007
+++ llvm/test/Feature/globalredefinition3.ll	Sat Apr 14 11:40:08 2007
@@ -1,8 +1,6 @@
-; When PR1067 is fixed, this should not be XFAIL any more.
-; RUN: llvm-as < %s -o /dev/null -f 2>&1 | \
+; RUN: ignore llvm-as < %s -o /dev/null -f |& \
 ; RUN:   grep "Redefinition of global variable named 'B'"
-
-; Test forward references and redefinitions of globals
+; END.
 
 @B = global i32 7
 @B = global i32 7


Index: llvm/test/Feature/packed_struct.ll
diff -u llvm/test/Feature/packed_struct.ll:1.6 llvm/test/Feature/packed_struct.ll:1.7
--- llvm/test/Feature/packed_struct.ll:1.6	Tue Mar 27 21:38:26 2007
+++ llvm/test/Feature/packed_struct.ll	Sat Apr 14 11:40:08 2007
@@ -1,8 +1,9 @@
 ; RUN: llvm-as < %s | llvm-dis > %t1.ll
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
-; RUN: diff %t1.ll %t2.ll &&
-; RUN: not grep cast %t2.ll &&
-; RUN: grep "<{" %t2.ll
+; RUN: diff %t1.ll %t2.ll
+; RUN: not grep cast %t2.ll
+; RUN: grep '\<{' %t2.ll
+; END.
 
 %struct.anon = type <{ i8, i32, i32, i32 }>
 @foos = external global %struct.anon