Convert the uses of '|&' to use '2>&1 |' instead, which works on old

versions of Bash. In addition, I can back out the change to the lit
built-in shell test runner to support this.

This should fix the majority of fallout on Darwin, but I suspect there
will be a few straggling issues.

llvm-svn: 159544

16 files changed, 16 insertions, 16 deletions

diff --git a/llvm/test/Verifier/2002-04-13-RetTypes.ll b/llvm/test/Verifier/2002-04-13-RetTypes.ll
index 2cbe6a922ee..b3611127114 100644
--- a/llvm/test/Verifier/2002-04-13-RetTypes.ll
+++ b/llvm/test/Verifier/2002-04-13-RetTypes.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& grep "value doesn't match function result type 'i32'"
+; RUN: not llvm-as < %s 2>&1 | grep "value doesn't match function result type 'i32'"
 
 ; Verify the the operand type of the ret instructions in a function match the
 ; delcared return type of the function they live in.
diff --git a/llvm/test/Verifier/2002-11-05-GetelementptrPointers.ll b/llvm/test/Verifier/2002-11-05-GetelementptrPointers.ll
index 98c43850b12..108ae5f7657 100644
--- a/llvm/test/Verifier/2002-11-05-GetelementptrPointers.ll
+++ b/llvm/test/Verifier/2002-11-05-GetelementptrPointers.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& grep "invalid getelementptr indices"
+; RUN: not llvm-as < %s 2>&1 | grep "invalid getelementptr indices"
 
 ; This testcase is invalid because we are indexing into a pointer that is 
 ; contained WITHIN a structure.
diff --git a/llvm/test/Verifier/2006-07-11-StoreStruct.ll b/llvm/test/Verifier/2006-07-11-StoreStruct.ll
index 80ab122d0b7..96d978d1dc0 100644
--- a/llvm/test/Verifier/2006-07-11-StoreStruct.ll
+++ b/llvm/test/Verifier/2006-07-11-StoreStruct.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s |& not grep {Instruction operands must be first-class}
+; RUN: llvm-as < %s 2>&1 | not grep {Instruction operands must be first-class}
 
 ; This previously was for PR826, but structs are now first-class so
 ; the following is now valid.
diff --git a/llvm/test/Verifier/2006-12-12-IntrinsicDefine.ll b/llvm/test/Verifier/2006-12-12-IntrinsicDefine.ll
index aa26265791d..6e7468c1d9e 100644
--- a/llvm/test/Verifier/2006-12-12-IntrinsicDefine.ll
+++ b/llvm/test/Verifier/2006-12-12-IntrinsicDefine.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& grep "llvm intrinsics cannot be defined"
+; RUN: not llvm-as < %s 2>&1 | grep "llvm intrinsics cannot be defined"
 ; PR1047
 
 define void @llvm.memcpy.p0i8.p0i8.i32(i8*, i8*, i32, i32, i1) {
diff --git a/llvm/test/Verifier/2008-03-01-AllocaSized.ll b/llvm/test/Verifier/2008-03-01-AllocaSized.ll
index 58f3098f951..51258bef76e 100644
--- a/llvm/test/Verifier/2008-03-01-AllocaSized.ll
+++ b/llvm/test/Verifier/2008-03-01-AllocaSized.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as %s -o /dev/null |& grep "Cannot allocate unsized type"
+; RUN: not llvm-as %s -o /dev/null 2>&1 | grep "Cannot allocate unsized type"
 ; PR2113
 
 define void @test() {
diff --git a/llvm/test/Verifier/2008-08-22-MemCpyAlignment.ll b/llvm/test/Verifier/2008-08-22-MemCpyAlignment.ll
index 65e884f46e3..c6d5afd51c9 100644
--- a/llvm/test/Verifier/2008-08-22-MemCpyAlignment.ll
+++ b/llvm/test/Verifier/2008-08-22-MemCpyAlignment.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as %s -o /dev/null |& grep "alignment argument of memory intrinsics must be a constant int"
+; RUN: not llvm-as %s -o /dev/null 2>&1 | grep "alignment argument of memory intrinsics must be a constant int"
 ; PR2318
 
 define void @x(i8* %a, i8* %src, i64 %len, i32 %align) nounwind  {
diff --git a/llvm/test/Verifier/2008-11-15-RetVoid.ll b/llvm/test/Verifier/2008-11-15-RetVoid.ll
index f2cdc8ce4de..42503fabbec 100644
--- a/llvm/test/Verifier/2008-11-15-RetVoid.ll
+++ b/llvm/test/Verifier/2008-11-15-RetVoid.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& grep "value doesn't match function result type 'void'"
+; RUN: not llvm-as < %s 2>&1 | grep "value doesn't match function result type 'void'"
 
 define void @foo() {
   ret i32 0
diff --git a/llvm/test/Verifier/AmbiguousPhi.ll b/llvm/test/Verifier/AmbiguousPhi.ll
index 58d8bdd3c64..f31bc107acc 100644
--- a/llvm/test/Verifier/AmbiguousPhi.ll
+++ b/llvm/test/Verifier/AmbiguousPhi.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& grep "multiple entries for the same basic block"
+; RUN: not llvm-as < %s 2>&1 | grep "multiple entries for the same basic block"
 
 
 
diff --git a/llvm/test/Verifier/PhiGrouping.ll b/llvm/test/Verifier/PhiGrouping.ll
index 0b677f2301c..7b42fd28e3d 100644
--- a/llvm/test/Verifier/PhiGrouping.ll
+++ b/llvm/test/Verifier/PhiGrouping.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& grep "PHI nodes not grouped at top"
+; RUN: not llvm-as < %s 2>&1 | grep "PHI nodes not grouped at top"
 
 
 
diff --git a/llvm/test/Verifier/SelfReferential.ll b/llvm/test/Verifier/SelfReferential.ll
index 449ea36519c..c24c0ebba3d 100644
--- a/llvm/test/Verifier/SelfReferential.ll
+++ b/llvm/test/Verifier/SelfReferential.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as %s -o /dev/null |& grep "Only PHI nodes may reference their own value"
+; RUN: not llvm-as %s -o /dev/null 2>&1 | grep "Only PHI nodes may reference their own value"
 
 ; Test that self referential instructions are not allowed
 
diff --git a/llvm/test/Verifier/aliasing-chain.ll b/llvm/test/Verifier/aliasing-chain.ll
index 1275abaff39..a52e796b2b8 100644
--- a/llvm/test/Verifier/aliasing-chain.ll
+++ b/llvm/test/Verifier/aliasing-chain.ll
@@ -1,4 +1,4 @@
-; RUN:  not llvm-as %s -o /dev/null |& grep "Aliasing chain should end with function or global variable"
+; RUN:  not llvm-as %s -o /dev/null 2>&1 | grep "Aliasing chain should end with function or global variable"
 
 ; Test that alising chain does not create a cycle
 
diff --git a/llvm/test/Verifier/cttz-undef-arg.ll b/llvm/test/Verifier/cttz-undef-arg.ll
index 48cd061d322..66c5396443a 100644
--- a/llvm/test/Verifier/cttz-undef-arg.ll
+++ b/llvm/test/Verifier/cttz-undef-arg.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s -o /dev/null |& FileCheck %s
+; RUN: not llvm-as < %s -o /dev/null 2>&1 | FileCheck %s
 
 declare i32 @llvm.ctlz.i32(i32, i1)
 declare i32 @llvm.cttz.i32(i32, i1)
diff --git a/llvm/test/Verifier/dominates.ll b/llvm/test/Verifier/dominates.ll
index 50bfa616f0d..17e2c339996 100644
--- a/llvm/test/Verifier/dominates.ll
+++ b/llvm/test/Verifier/dominates.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s -o /dev/null |& FileCheck %s
+; RUN: not llvm-as < %s -o /dev/null 2>&1 | FileCheck %s
 
 define i32 @f1(i32 %x) {
        %y = add i32 %z, 1
diff --git a/llvm/test/Verifier/fpmath.ll b/llvm/test/Verifier/fpmath.ll
index b764a63f0a4..7002c5c825f 100644
--- a/llvm/test/Verifier/fpmath.ll
+++ b/llvm/test/Verifier/fpmath.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s |& FileCheck %s
+; RUN: not llvm-as < %s 2>&1 | FileCheck %s
 
 define void @fpmath1(i32 %i, float %f, <2 x float> %g) {
   %s = add i32 %i, %i, !fpmath !0
diff --git a/llvm/test/Verifier/invoke.ll b/llvm/test/Verifier/invoke.ll
index 2a0336b03f3..06f40f00527 100644
--- a/llvm/test/Verifier/invoke.ll
+++ b/llvm/test/Verifier/invoke.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s -o /dev/null |& FileCheck %s
+; RUN: not llvm-as < %s -o /dev/null 2>&1 | FileCheck %s
 
 ; PR1042
 define i32 @foo() {
diff --git a/llvm/test/Verifier/range-1.ll b/llvm/test/Verifier/range-1.ll
index 7a317fca8f2..b6a75d13bba 100644
--- a/llvm/test/Verifier/range-1.ll
+++ b/llvm/test/Verifier/range-1.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as < %s -o /dev/null |& FileCheck %s
+; RUN: not llvm-as < %s -o /dev/null 2>&1 | FileCheck %s
 
 define void @f1(i8* %x) {
 entry: