[llvm-commits] CVS: llvm/test/Transforms/CorrelatedExprs/basictest.ll dg.exp looptest.ll nullpointer.ll switch.ll whet.ll

[Reid Spencer]

Changes in directory llvm/test/Transforms/CorrelatedExprs:

basictest.ll updated: 1.4 -> 1.5
dg.exp updated: 1.4 -> 1.5
looptest.ll updated: 1.6 -> 1.7
nullpointer.ll updated: 1.7 -> 1.8
switch.ll updated: 1.2 -> 1.3
whet.ll updated: 1.4 -> 1.5
---
Log message:

For PR1319: http://llvm.org/PR1319 :
Convert to use the new Tcl expr based test harness.


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

 basictest.ll   |    3 ++-
 dg.exp         |    4 ++--
 looptest.ll    |    5 +++--
 nullpointer.ll |    5 +++--
 switch.ll      |    4 +++-
 whet.ll        |    3 ++-
 6 files changed, 15 insertions(+), 9 deletions(-)


Index: llvm/test/Transforms/CorrelatedExprs/basictest.ll
diff -u llvm/test/Transforms/CorrelatedExprs/basictest.ll:1.4 llvm/test/Transforms/CorrelatedExprs/basictest.ll:1.5
--- llvm/test/Transforms/CorrelatedExprs/basictest.ll:1.4	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/CorrelatedExprs/basictest.ll	Sun Apr 15 03:01:33 2007
@@ -1,4 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -cee -constprop -instcombine -dce | llvm-dis | not grep 'REMOVE'
+; RUN: llvm-upgrade < %s | llvm-as | opt -cee -constprop -instcombine -dce | \
+; RUN:   llvm-dis | not grep REMOVE
 
 int %test1(int %A) {
 	%cond = seteq int %A, 40


Index: llvm/test/Transforms/CorrelatedExprs/dg.exp
diff -u llvm/test/Transforms/CorrelatedExprs/dg.exp:1.4 llvm/test/Transforms/CorrelatedExprs/dg.exp:1.5
--- llvm/test/Transforms/CorrelatedExprs/dg.exp:1.4	Wed Apr 11 14:56:58 2007
+++ llvm/test/Transforms/CorrelatedExprs/dg.exp	Sun Apr 15 03:01:33 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/Transforms/CorrelatedExprs/looptest.ll
diff -u llvm/test/Transforms/CorrelatedExprs/looptest.ll:1.6 llvm/test/Transforms/CorrelatedExprs/looptest.ll:1.7
--- llvm/test/Transforms/CorrelatedExprs/looptest.ll:1.6	Sun Jan 14 19:04:21 2007
+++ llvm/test/Transforms/CorrelatedExprs/looptest.ll	Sun Apr 15 03:01:33 2007
@@ -12,8 +12,9 @@
 ; Note that this is a "feature" test, not a correctness test.
 ;
 ; XFAIL: *
-; RUN: llvm-upgrade < %s | llvm-as | opt -cee -simplifycfg -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -cee -simplifycfg | llvm-dis | not grep cond213
+; RUN: llvm-upgrade < %s | llvm-as | opt -cee -simplifycfg | llvm-dis | \
+; RUN:   not grep cond213
+; END.
 ;
 implementation   ; Functions:
 


Index: llvm/test/Transforms/CorrelatedExprs/nullpointer.ll
diff -u llvm/test/Transforms/CorrelatedExprs/nullpointer.ll:1.7 llvm/test/Transforms/CorrelatedExprs/nullpointer.ll:1.8
--- llvm/test/Transforms/CorrelatedExprs/nullpointer.ll:1.7	Sun Jan 14 19:04:21 2007
+++ llvm/test/Transforms/CorrelatedExprs/nullpointer.ll	Sun Apr 15 03:01:33 2007
@@ -2,8 +2,9 @@
 ; Any succeeding uses of the pointer should get this info
 ;
 ; XFAIL: *
-; RUN: llvm-upgrade < %s | llvm-as | opt -cee -instcombine -simplifycfg -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -cee -instcombine -simplifycfg | llvm-dis | not grep br
+; RUN: llvm-upgrade < %s | llvm-as | opt -cee -instcombine -simplifycfg | \
+; RUN:   llvm-dis | not grep br
+; END.
 
 implementation   ; Functions:
 


Index: llvm/test/Transforms/CorrelatedExprs/switch.ll
diff -u llvm/test/Transforms/CorrelatedExprs/switch.ll:1.2 llvm/test/Transforms/CorrelatedExprs/switch.ll:1.3
--- llvm/test/Transforms/CorrelatedExprs/switch.ll:1.2	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/CorrelatedExprs/switch.ll	Sun Apr 15 03:01:33 2007
@@ -1,4 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -cee -constprop -instcombine -dce | llvm-dis | not grep 'REMOVE'
+; RUN: llvm-upgrade < %s | llvm-as | opt -cee -constprop -instcombine -dce | \
+; RUN:   llvm-dis | not grep REMOVE
+; END.
 
 int %test_case_values_should_propagate(int %A) {
     switch int %A, label %D [


Index: llvm/test/Transforms/CorrelatedExprs/whet.ll
diff -u llvm/test/Transforms/CorrelatedExprs/whet.ll:1.4 llvm/test/Transforms/CorrelatedExprs/whet.ll:1.5
--- llvm/test/Transforms/CorrelatedExprs/whet.ll:1.4	Fri Dec  1 22:23:09 2006
+++ llvm/test/Transforms/CorrelatedExprs/whet.ll	Sun Apr 15 03:01:33 2007
@@ -11,7 +11,8 @@
 ;
 ; This should eliminate all BB's except BB0, BB9, BB10
 ;
-; RUN: llvm-upgrade < %s | llvm-as | opt -cee -instcombine -simplifycfg | llvm-dis | not grep 'bb[2-8]'
+; RUN: llvm-upgrade < %s | llvm-as | opt -cee -instcombine -simplifycfg | \
+; RUN:   llvm-dis | not grep {bb\[2-8\]}
 
 implementation   ; Functions: