For PR1319:

Remove && from the end of the lines to prevent tests from throwing run
lines into the background. Also, clean up places where the same command
is run multiple times by using a temporary file.

llvm-svn: 36142

28 files changed, 61 insertions, 62 deletions

diff --git a/llvm/test/Transforms/ConstProp/bitcast.ll b/llvm/test/Transforms/ConstProp/bitcast.ll
index 39cd53487f7..1fc25704a66 100644
--- a/llvm/test/Transforms/ConstProp/bitcast.ll
+++ b/llvm/test/Transforms/ConstProp/bitcast.ll
@@ -1,4 +1,3 @@
-; RUN: llvm-upgrade < %s | llvm-as | llvm-dis &&
 ; RUN: llvm-upgrade < %s | llvm-as | llvm-dis | grep 0x36A0000000000000
 
 %A = global float bitcast (int 1 to float)
diff --git a/llvm/test/Transforms/DeadArgElim/dead_vaargs.ll b/llvm/test/Transforms/DeadArgElim/dead_vaargs.ll
index c615ed06502..ecb84cc9650 100644
--- a/llvm/test/Transforms/DeadArgElim/dead_vaargs.ll
+++ b/llvm/test/Transforms/DeadArgElim/dead_vaargs.ll
@@ -1,5 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -deadargelim -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -deadargelim | llvm-dis | not grep 47 &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -deadargelim | llvm-dis | not grep 47 
 ; RUN: llvm-upgrade < %s | llvm-as | opt -deadargelim | llvm-dis | not grep 1.0
 
 int %bar(int %A) {
diff --git a/llvm/test/Transforms/GCSE/vectorops.ll b/llvm/test/Transforms/GCSE/vectorops.ll
index 3804c290d7c..694d9d590f0 100644
--- a/llvm/test/Transforms/GCSE/vectorops.ll
+++ b/llvm/test/Transforms/GCSE/vectorops.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -gcse -instcombine -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -gcse -instcombine | llvm-dis | not grep sub
+; RUN: llvm-upgrade < %s | llvm-as | opt -gcse -instcombine | \
+; RUN:   llvm-dis | not grep sub
 
 uint %test_extractelement(<4 x uint> %V) {
         %R = extractelement <4 x uint> %V, uint 1
diff --git a/llvm/test/Transforms/GlobalOpt/ctor-list-opt.ll b/llvm/test/Transforms/GlobalOpt/ctor-list-opt.ll
index 8f75deb61b6..6270f4fabc1 100644
--- a/llvm/test/Transforms/GlobalOpt/ctor-list-opt.ll
+++ b/llvm/test/Transforms/GlobalOpt/ctor-list-opt.ll
@@ -1,4 +1,3 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt -disable-output &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -globalopt | llvm-dis | not grep CTOR
 
 %llvm.global_ctors = appending global [10 x { int, void ()* }] [ 
diff --git a/llvm/test/Transforms/IndVarsSimplify/loop_evaluate_2.ll b/llvm/test/Transforms/IndVarsSimplify/loop_evaluate_2.ll
index e11e3272576..c7426918462 100644
--- a/llvm/test/Transforms/IndVarsSimplify/loop_evaluate_2.ll
+++ b/llvm/test/Transforms/IndVarsSimplify/loop_evaluate_2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | opt -indvars -adce -simplifycfg | llvm-dis | grep select &&
+; RUN: llvm-as < %s | opt -indvars -adce -simplifycfg | llvm-dis | grep select
 ; RUN: llvm-as < %s | opt -indvars -adce -simplifycfg | llvm-dis | not grep br
 ; PR1179
 
diff --git a/llvm/test/Transforms/Inline/dynamic_alloca_test.ll b/llvm/test/Transforms/Inline/dynamic_alloca_test.ll
index 2b30b30ab76..cccf2d9b46c 100644
--- a/llvm/test/Transforms/Inline/dynamic_alloca_test.ll
+++ b/llvm/test/Transforms/Inline/dynamic_alloca_test.ll
@@ -1,8 +1,8 @@
 ; Test that functions with dynamic allocas get inlined in a case where
 ; naively inlining it would result in a miscompilation.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -inline &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | grep llvm.stacksave &&
+; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | \
+; RUN:   grep llvm.stacksave
 ; RUN: llvm-upgrade < %s | llvm-as | opt -inline | llvm-dis | not grep callee
 
 declare void %ext(int*)
diff --git a/llvm/test/Transforms/InstCombine/2007-04-04-BadFoldBitcastIntoMalloc.ll b/llvm/test/Transforms/InstCombine/2007-04-04-BadFoldBitcastIntoMalloc.ll
index d7a5b44b033..e738635be76 100644
--- a/llvm/test/Transforms/InstCombine/2007-04-04-BadFoldBitcastIntoMalloc.ll
+++ b/llvm/test/Transforms/InstCombine/2007-04-04-BadFoldBitcastIntoMalloc.ll
@@ -2,7 +2,6 @@
 ; a malloc messes up the element count, causing an extra 4GB to be allocated on
 ; 64-bit targets.
 ;
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep {= add }
 
 target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64"
diff --git a/llvm/test/Transforms/InstCombine/add.ll b/llvm/test/Transforms/InstCombine/add.ll
index 87bb7733f3e..df99e96f5fe 100644
--- a/llvm/test/Transforms/InstCombine/add.ll
+++ b/llvm/test/Transforms/InstCombine/add.ll
@@ -1,6 +1,5 @@
 ; This test makes sure that add instructions are properly eliminated.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -disable-output &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | \
 ; RUN:    grep -v OK | not grep add
 ; END.
diff --git a/llvm/test/Transforms/InstCombine/add2.ll b/llvm/test/Transforms/InstCombine/add2.ll
index f9ca397caaa..ff899461dd1 100644
--- a/llvm/test/Transforms/InstCombine/add2.ll
+++ b/llvm/test/Transforms/InstCombine/add2.ll
@@ -1,4 +1,3 @@
-; RUN: llvm-as < %s | opt -instcombine -disable-output &&
 ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
 ; RUN:    grep -v OK | not grep add
 
diff --git a/llvm/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll b/llvm/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll
index ffbe6fb4254..e7cfd76ec70 100644
--- a/llvm/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll
+++ b/llvm/test/Transforms/LCSSA/2006-06-03-IncorrectIDFPhis.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \
-; RUN:   grep "%SJE.0.0.lcssa = phi .struct.SetJmpMapEntry" &&
+; RUN:   grep {%SJE.0.0.lcssa = phi .struct.SetJmpMapEntry}
 ; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \
-; RUN:   grep "%SJE.0.0.lcssa1 = phi .struct.SetJmpMapEntry"
+; RUN:   grep {%SJE.0.0.lcssa1 = phi .struct.SetJmpMapEntry}
 
 %struct.SetJmpMapEntry = type { sbyte*, uint, %struct.SetJmpMapEntry* }
 
diff --git a/llvm/test/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll b/llvm/test/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll
index 3647008e3a5..02765dcdc15 100644
--- a/llvm/test/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll
+++ b/llvm/test/Transforms/LCSSA/2006-06-12-MultipleExitsSameBlock.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \
-; RUN:    grep "%X.1.lcssa" &&
+; RUN:    grep {%X.1.lcssa}
 ; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \
-; RUN:    not grep "%X.1.lcssa1"
+; RUN:    not grep {%X.1.lcssa1}
 
 declare bool %c1()
 declare bool %c2()
diff --git a/llvm/test/Transforms/LCSSA/basictest.ll b/llvm/test/Transforms/LCSSA/basictest.ll
index 1dc69a6b11a..4dc1f54cd72 100644
--- a/llvm/test/Transforms/LCSSA/basictest.ll
+++ b/llvm/test/Transforms/LCSSA/basictest.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \
-; RUN:   grep "X3.lcssa = phi i32" &&
+; RUN:   grep {X3.lcssa = phi i32}
 ; RUN: llvm-upgrade < %s | llvm-as | opt -lcssa | llvm-dis | \
-; RUN:   grep "X4 = add i32 3, %X3.lcssa"
+; RUN:   grep {X4 = add i32 3, %X3.lcssa}
 
 void %lcssa(bool %S2) {
 entry:
diff --git a/llvm/test/Transforms/LoopRotate/PhiRename-1.ll b/llvm/test/Transforms/LoopRotate/PhiRename-1.ll
index 7ea0ca6b21a..573e3960bd8 100644
--- a/llvm/test/Transforms/LoopRotate/PhiRename-1.ll
+++ b/llvm/test/Transforms/LoopRotate/PhiRename-1.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-as < %s | opt -loop-rotate -disable-output &&
-; RUN: llvm-as < %s | opt -loop-rotate | llvm-dis | not grep "\[ .tmp224" 
+; RUN: llvm-as < %s | opt -loop-rotate | llvm-dis | not grep {\\\[ .tmp224} 
+; END.
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64"
 
 	%struct.FILE = type { i8*, i32, i32, i16, i16, %struct.__sbuf, i32, i8*, i32 (i8*)*, i32 (i8*, i8*, i32)*, i64 (i8*, i64, i32)*, i32 (i8*, i8*, i32)*, %struct.__sbuf, %struct.__sFILEX*, i32, [3 x i8], [1 x i8], %struct.__sbuf, i32, i64 }
diff --git a/llvm/test/Transforms/LoopStrengthReduce/nested-reduce.ll b/llvm/test/Transforms/LoopStrengthReduce/nested-reduce.ll
index 1959832d51c..6f709e34bd5 100644
--- a/llvm/test/Transforms/LoopStrengthReduce/nested-reduce.ll
+++ b/llvm/test/Transforms/LoopStrengthReduce/nested-reduce.ll
@@ -1,4 +1,3 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -loop-reduce | llvm-dis | not grep mul
 
 ; Make sure we don't get a multiply by 6 in this loop.
diff --git a/llvm/test/Transforms/LoopUnroll/2006-08-24-MultiBlockLoop.ll b/llvm/test/Transforms/LoopUnroll/2006-08-24-MultiBlockLoop.ll
index c21ae484db0..42ff3fafe7f 100644
--- a/llvm/test/Transforms/LoopUnroll/2006-08-24-MultiBlockLoop.ll
+++ b/llvm/test/Transforms/LoopUnroll/2006-08-24-MultiBlockLoop.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unroll | llvm-dis | grep "bb72.2"
+; RUN: llvm-upgrade < %s | llvm-as | opt -loop-unroll | llvm-dis | grep bb72.2
 
 void %vorbis_encode_noisebias_setup() {
 entry:
diff --git a/llvm/test/Transforms/LowerInvoke/basictest.ll b/llvm/test/Transforms/LowerInvoke/basictest.ll
index 4150ad3efbd..8c38b89c4bd 100644
--- a/llvm/test/Transforms/LowerInvoke/basictest.ll
+++ b/llvm/test/Transforms/LowerInvoke/basictest.ll
@@ -1,4 +1,3 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -lowerinvoke -disable-output &&
 ; RUN: llvm-upgrade < %s | llvm-as | opt -lowerinvoke -disable-output -enable-correct-eh-support
 
 implementation
diff --git a/llvm/test/Transforms/LowerSwitch/feature.ll b/llvm/test/Transforms/LowerSwitch/feature.ll
index cb88e31c16c..0b3cdc780fb 100644
--- a/llvm/test/Transforms/LowerSwitch/feature.ll
+++ b/llvm/test/Transforms/LowerSwitch/feature.ll
@@ -1,6 +1,7 @@
-; RUN: llvm-as %s -o - | opt -lowerswitch | llvm-dis | grep slt | wc -l | grep 10 &&
-; RUN: llvm-as %s -o - | opt -lowerswitch | llvm-dis | grep ule | wc -l | grep 3 &&
-; RUN: llvm-as %s -o - | opt -lowerswitch | llvm-dis | grep eq | wc -l | grep 9
+; RUN: llvm-as %s -o - | opt -lowerswitch | llvm-dis > %t
+; RUN: grep slt %t | wc -l | grep 10
+; RUN: grep ule %t | wc -l | grep 3
+; RUN: grep eq  %t | wc -l | grep 9
 
 define i32 @main(i32 %tmp158) {
 entry:
diff --git a/llvm/test/Transforms/PredicateSimplifier/2006-10-22-IntOr.ll b/llvm/test/Transforms/PredicateSimplifier/2006-10-22-IntOr.ll
index 0cdd58085b7..01fbee1a569 100644
--- a/llvm/test/Transforms/PredicateSimplifier/2006-10-22-IntOr.ll
+++ b/llvm/test/Transforms/PredicateSimplifier/2006-10-22-IntOr.ll
@@ -1,6 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -instcombine -simplifycfg -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | not grep fail &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | grep -c pass | grep 3
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN:   opt -predsimplify -instcombine -simplifycfg -o %t -f
+; RUN: grep -v declare %t | not grep fail
+; RUN: grep -v declare %t | grep -c pass | grep 3
 
 int %test1(int %x, int %y) {
 entry:
diff --git a/llvm/test/Transforms/PredicateSimplifier/2006-10-25-AddSetCC.ll b/llvm/test/Transforms/PredicateSimplifier/2006-10-25-AddSetCC.ll
index 5c5a4a48d46..a9040123e30 100644
--- a/llvm/test/Transforms/PredicateSimplifier/2006-10-25-AddSetCC.ll
+++ b/llvm/test/Transforms/PredicateSimplifier/2006-10-25-AddSetCC.ll
@@ -1,5 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -instcombine -simplifycfg -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | grep -c pass | grep 2
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN:   opt -predsimplify -instcombine -simplifycfg | llvm-dis | \
+; RUN:   grep -v declare | grep -c pass | grep 2
 
 int %test(int %x, int %y) {
 entry:
diff --git a/llvm/test/Transforms/PredicateSimplifier/predsimplify.ll b/llvm/test/Transforms/PredicateSimplifier/predsimplify.ll
index efe28d184ab..b88122f57c0 100644
--- a/llvm/test/Transforms/PredicateSimplifier/predsimplify.ll
+++ b/llvm/test/Transforms/PredicateSimplifier/predsimplify.ll
@@ -1,5 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | not grep fail &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -predsimplify -instcombine -simplifycfg | llvm-dis | grep -v declare | grep -c pass | grep 4
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN:   opt -predsimplify -instcombine -simplifycfg | llvm-dis > %t
+; RUN: grep -v declare %t | not grep fail 
+; RUN: grep -v declare %t | grep -c pass | grep 4
 
 void %test1(int %x) {
 entry:
diff --git a/llvm/test/Transforms/Reassociate/mul-factor3.ll b/llvm/test/Transforms/Reassociate/mul-factor3.ll
index 5e06fbca847..1272ff62dd8 100644
--- a/llvm/test/Transforms/Reassociate/mul-factor3.ll
+++ b/llvm/test/Transforms/Reassociate/mul-factor3.ll
@@ -1,7 +1,9 @@
 ; This should be one add and two multiplies.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep mul | wc -l | grep 2 &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep add | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN:   opt -reassociate -instcombine | llvm-dis > %t 
+; RUN: grep mul %t | wc -l | grep 2
+; RUN: grep add %t | wc -l | grep 1
 
 int %test(int %A, int %B, int %C) {
 	%aa = mul int %A, %A
diff --git a/llvm/test/Transforms/Reassociate/mulfactor2.ll b/llvm/test/Transforms/Reassociate/mulfactor2.ll
index 062e3af4f50..dd1e8ae8a35 100644
--- a/llvm/test/Transforms/Reassociate/mulfactor2.ll
+++ b/llvm/test/Transforms/Reassociate/mulfactor2.ll
@@ -1,7 +1,10 @@
 ; This should turn into one multiply and one add.
 
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -reassociate -instcombine | llvm-dis | grep mul | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine -reassociate -instcombine | llvm-dis | grep add | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN:   opt -instcombine -reassociate -instcombine | llvm-dis -o %t 
+; RUN: grep mul %t | wc -l | grep 1
+; RUN: grep add %t | wc -l | grep 1
+
 int %main(int %t) {
         %tmp.3 = mul int %t, 12         ; <int> [#uses=1]
         %tmp.4 = add int %tmp.3, 5              ; <int> [#uses=1]
diff --git a/llvm/test/Transforms/Reassociate/shift-factor.ll b/llvm/test/Transforms/Reassociate/shift-factor.ll
index 51513c28956..ed8ed392c5f 100644
--- a/llvm/test/Transforms/Reassociate/shift-factor.ll
+++ b/llvm/test/Transforms/Reassociate/shift-factor.ll
@@ -1,6 +1,8 @@
 ; There should be exactly one shift and one add left.
-; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep shl | wc -l | grep 1 &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -reassociate -instcombine | llvm-dis | grep add | wc -l | grep 1
+; RUN: llvm-upgrade < %s | llvm-as | \
+; RUN:   opt -reassociate -instcombine | llvm-dis > %t  
+; RUN: grep shl %t | wc -l | grep 1
+; RUN: grep add %t | wc -l | grep 1
 
 int %test(int %X, int %Y) {
         %tmp.2 = shl int %X, ubyte 1            ; <int> [#uses=1]
diff --git a/llvm/test/Transforms/ScalarRepl/AggregatePromote.ll b/llvm/test/Transforms/ScalarRepl/AggregatePromote.ll
index ea16b5e5eea..67ccad05cc2 100644
--- a/llvm/test/Transforms/ScalarRepl/AggregatePromote.ll
+++ b/llvm/test/Transforms/ScalarRepl/AggregatePromote.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | not grep alloca &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -disable-output
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | \
+; RUN:   not grep alloca 
 
 target endian = big
 target pointersize = 32
diff --git a/llvm/test/Transforms/ScalarRepl/vector_promote.ll b/llvm/test/Transforms/ScalarRepl/vector_promote.ll
index 2e9bce77402..73e2c64a3f7 100644
--- a/llvm/test/Transforms/ScalarRepl/vector_promote.ll
+++ b/llvm/test/Transforms/ScalarRepl/vector_promote.ll
@@ -1,6 +1,5 @@
-
-; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl -disable-output &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | not grep alloca
+; RUN: llvm-upgrade < %s | llvm-as | opt -scalarrepl | llvm-dis | \
+; RUN:   not grep alloca
 
 void %test(<4 x float>* %F, float %f) {
 entry:
diff --git a/llvm/test/Transforms/SimplifyLibCalls/floor.ll b/llvm/test/Transforms/SimplifyLibCalls/floor.ll
index 06f159f0a08..2b940fdb800 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/floor.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/floor.ll
@@ -1,15 +1,10 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | \
-; RUN:    not grep {call.*floor(} &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | \
-; RUN:    grep {call.*floorf(}
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | \
-; RUN:    not grep {call.*ceil(} &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | \
-; RUN:    grep {call.*ceilf(}
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | \
-; RUN:    not grep {call.*nearbyint(} &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | \
-; RUN:    grep {call.*nearbyintf(}
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis > %t
+; RUN: not grep {call.*floor(} %t
+; RUN: grep {call.*floorf(} %t
+; RUN: not grep {call.*ceil(} %t
+; RUN: grep {call.*ceilf(} %t
+; RUN: not grep {call.*nearbyint(} %t
+; RUN: grep {call.*nearbyintf(} %t
 ; XFAIL: sparc
 
 declare double %floor(double)
diff --git a/llvm/test/Transforms/TailCallElim/return-undef.ll b/llvm/test/Transforms/TailCallElim/return-undef.ll
index e721447e6f3..b7d2f816495 100644
--- a/llvm/test/Transforms/TailCallElim/return-undef.ll
+++ b/llvm/test/Transforms/TailCallElim/return-undef.ll
@@ -1,5 +1,6 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | grep sub &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis | not grep call
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailcallelim | llvm-dis > %t
+; RUN: grep sub %t
+; RUN: not grep call %t
 
 int %test(int %X) {
 	%Y = sub int %X, 1
diff --git a/llvm/test/Transforms/TailDup/if-tail-dup.ll b/llvm/test/Transforms/TailDup/if-tail-dup.ll
index 2a4425e117f..87c90276278 100644
--- a/llvm/test/Transforms/TailDup/if-tail-dup.ll
+++ b/llvm/test/Transforms/TailDup/if-tail-dup.ll
@@ -1,7 +1,7 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate | llc -march=x86 | \
-; RUN:    grep {je } &&
-; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate | llc -march=x86 | \
-; RUN:    not grep jmp
+; RUN: llvm-upgrade < %s | llvm-as | opt -tailduplicate | \
+; RUN:   llc -march=x86 -o %t -f
+; RUN: grep {je } %t
+; RUN: not grep jmp %t
 ; END.
 ; This should have no unconditional jumps in it.  The C source is: