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

8 files changed, 29 insertions, 29 deletions

diff --git a/llvm/test/CodeGen/Generic/2006-07-03-schedulers.ll b/llvm/test/CodeGen/Generic/2006-07-03-schedulers.ll
index 7120c1ff409..70fc0731298 100644
--- a/llvm/test/CodeGen/Generic/2006-07-03-schedulers.ll
+++ b/llvm/test/CodeGen/Generic/2006-07-03-schedulers.ll
@@ -1,9 +1,9 @@
-; RUN: llvm-upgrade %s | llvm-as | llc -sched=none &&
-; RUN: llvm-upgrade %s | llvm-as | llc -sched=default &&
-; RUN: llvm-upgrade %s | llvm-as | llc -sched=simple &&
-; RUN: llvm-upgrade %s | llvm-as | llc -sched=simple-noitin &&
-; RUN: llvm-upgrade %s | llvm-as | llc -sched=list-td &&
-; RUN: llvm-upgrade %s | llvm-as | llc -sched=list-tdrr &&
+; RUN: llvm-upgrade %s | llvm-as | llc -sched=none
+; RUN: llvm-upgrade %s | llvm-as | llc -sched=default
+; RUN: llvm-upgrade %s | llvm-as | llc -sched=simple
+; RUN: llvm-upgrade %s | llvm-as | llc -sched=simple-noitin
+; RUN: llvm-upgrade %s | llvm-as | llc -sched=list-td
+; RUN: llvm-upgrade %s | llvm-as | llc -sched=list-tdrr
 ; RUN: llvm-upgrade %s | llvm-as | llc -sched=list-burr
 ; PR859
 
diff --git a/llvm/test/CodeGen/Generic/2006-11-06-MemIntrinsicExpand.ll b/llvm/test/CodeGen/Generic/2006-11-06-MemIntrinsicExpand.ll
index d7ef1db6353..330bee66314 100644
--- a/llvm/test/CodeGen/Generic/2006-11-06-MemIntrinsicExpand.ll
+++ b/llvm/test/CodeGen/Generic/2006-11-06-MemIntrinsicExpand.ll
@@ -1,4 +1,3 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 &&
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 | not grep adc
 
 ; PR987
diff --git a/llvm/test/CodeGen/Generic/2007-04-14-BitTestsBadMask.ll b/llvm/test/CodeGen/Generic/2007-04-14-BitTestsBadMask.ll
index 0f5688db372..94b437c12f0 100644
--- a/llvm/test/CodeGen/Generic/2007-04-14-BitTestsBadMask.ll
+++ b/llvm/test/CodeGen/Generic/2007-04-14-BitTestsBadMask.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep 8388635  &&
+; RUN: llvm-as < %s | llc -march=x86 | grep 8388635
 ; RUN: llvm-as < %s | llc -march=x86-64 | grep 4294981120
 ; PR 1325
 
diff --git a/llvm/test/CodeGen/Generic/fpowi-promote.ll b/llvm/test/CodeGen/Generic/fpowi-promote.ll
index 118bd68cf39..55c2d2ad0c6 100644
--- a/llvm/test/CodeGen/Generic/fpowi-promote.ll
+++ b/llvm/test/CodeGen/Generic/fpowi-promote.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc &&
+; RUN: llvm-as < %s | llc
 ; RUN: llvm-as < %s | llc -march=x86 -mcpu=i386
 
 ; PR1239
diff --git a/llvm/test/CodeGen/Generic/switch-lower-feature-2.ll b/llvm/test/CodeGen/Generic/switch-lower-feature-2.ll
index 1edd47f83e5..6552cb1b34e 100644
--- a/llvm/test/CodeGen/Generic/switch-lower-feature-2.ll
+++ b/llvm/test/CodeGen/Generic/switch-lower-feature-2.ll
@@ -1,12 +1,13 @@
-; RUN: llvm-as < %s | llc -march=x86 -o - | grep jb | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -o - | grep \$6 | wc -l | grep 2 &&
-; RUN: llvm-as < %s | llc -march=x86 -o - | grep 1024 | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -o - | grep 1023 | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -o - | grep 119  | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -o - | grep JTI | wc -l | grep 2 &&
-; RUN: llvm-as < %s | llc -march=x86 -o - | grep jg | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -o - | grep ja | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -o - | grep js | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=x86 -o %t -f
+; RUN: grep jb %t | wc -l | grep 1
+; RUN: grep \\\$6 %t | wc -l | grep 2 
+; RUN: grep 1024 %t | wc -l | grep 1 
+; RUN: grep 1023 %t | wc -l | grep 1 
+; RUN: grep 119  %t | wc -l | grep 1 
+; RUN: grep JTI %t | wc -l | grep 2 
+; RUN: grep jg %t | wc -l | grep 1 
+; RUN: grep ja %t | wc -l | grep 1 
+; RUN: grep js %t | wc -l | grep 1
 
 target triple = "i686-pc-linux-gnu"
 
diff --git a/llvm/test/CodeGen/Generic/switch-lower-feature.ll b/llvm/test/CodeGen/Generic/switch-lower-feature.ll
index 195d2167138..71dbc26b8f2 100644
--- a/llvm/test/CodeGen/Generic/switch-lower-feature.ll
+++ b/llvm/test/CodeGen/Generic/switch-lower-feature.ll
@@ -1,7 +1,7 @@
-; RUN: llvm-as < %s | llc -march=x86 -o - | grep \$7 | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -o - | grep \$6 | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -o - | grep 1024 | wc -l | grep 1 &&
-; RUN: llvm-as < %s | llc -march=x86 -o - | grep jb | wc -l | grep 2 &&
+; RUN: llvm-as < %s | llc -march=x86 -o - | grep \$7 | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=x86 -o - | grep \$6 | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=x86 -o - | grep 1024 | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=x86 -o - | grep jb | wc -l | grep 2
 ; RUN: llvm-as < %s | llc -march=x86 -o - | grep je | wc -l | grep 1
 
 define i32 @main(i32 %tmp158) {
diff --git a/llvm/test/CodeGen/Generic/vector-identity-shuffle.ll b/llvm/test/CodeGen/Generic/vector-identity-shuffle.ll
index 5b3de3fe765..9cccf4b381f 100644
--- a/llvm/test/CodeGen/Generic/vector-identity-shuffle.ll
+++ b/llvm/test/CodeGen/Generic/vector-identity-shuffle.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep test: &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep vperm &&
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | grep test:
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 | not grep vperm
 ; RUN: llvm-upgrade < %s | llvm-as | llc 
 
 void %test(<4 x float> *%tmp2.i) {
diff --git a/llvm/test/CodeGen/Generic/vector.ll b/llvm/test/CodeGen/Generic/vector.ll
index 207c51dc431..018ba6aab29 100644
--- a/llvm/test/CodeGen/Generic/vector.ll
+++ b/llvm/test/CodeGen/Generic/vector.ll
@@ -1,9 +1,9 @@
 ; Test that vectors are scalarized/lowered correctly.
-; RUN: llvm-upgrade < %s | llvm-as | llc &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple a-b-c &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g3 &&
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=i386 &&
+; RUN: llvm-upgrade < %s | llvm-as | llc
+; RUN: llvm-upgrade < %s | llvm-as | llc -mtriple a-b-c
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g5
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=ppc32 -mcpu=g3
+; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=i386
 ; RUN: llvm-upgrade < %s | llvm-as | llc -march=x86 -mcpu=yonah
 
 %f1 = type <1 x float>