aboutsummaryrefslogtreecommitdiff
path: root/test/Other
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2012-07-02 18:37:59 +0000
committerChandler Carruth <chandlerc@gmail.com>2012-07-02 18:37:59 +0000
commit49589f0d0e35f643e697ab7ae8a51a530d38b0d8 (patch)
treea8ead242b50930da01de9e4a02ac519fe7b5518c /test/Other
parent506bb19d10fd3f1a9486e9c8bef632f13da8fe4a (diff)
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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@159544 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Other')
-rw-r--r--test/Other/invalid-commandline-option.ll2
-rw-r--r--test/Other/lint.ll2
-rw-r--r--test/Other/optimize-options.ll10
3 files changed, 7 insertions, 7 deletions
diff --git a/test/Other/invalid-commandline-option.ll b/test/Other/invalid-commandline-option.ll
index 3af40dd55d..583d4496dc 100644
--- a/test/Other/invalid-commandline-option.ll
+++ b/test/Other/invalid-commandline-option.ll
@@ -1,3 +1,3 @@
-; RUN: not opt --foo |& grep "Unknown command line argument"
+; RUN: not opt --foo 2>&1 | grep "Unknown command line argument"
; there is no --foo
diff --git a/test/Other/lint.ll b/test/Other/lint.ll
index ca2b1a336a..c84f56f8f6 100644
--- a/test/Other/lint.ll
+++ b/test/Other/lint.ll
@@ -1,4 +1,4 @@
-; RUN: opt -basicaa -lint -disable-output < %s |& FileCheck %s
+; RUN: opt -basicaa -lint -disable-output < %s 2>&1 | FileCheck %s
target datalayout = "e-p:64:64:64"
declare fastcc void @bar()
diff --git a/test/Other/optimize-options.ll b/test/Other/optimize-options.ll
index 5b1fe52ac1..888a78fd9d 100644
--- a/test/Other/optimize-options.ll
+++ b/test/Other/optimize-options.ll
@@ -1,8 +1,8 @@
-;RUN: opt -S -O1 -debug-pass=Arguments |& FileCheck %s
-;RUN: opt -S -O2 -debug-pass=Arguments |& FileCheck %s
-;RUN: opt -S -Os -debug-pass=Arguments |& FileCheck %s
-;RUN: opt -S -Oz -debug-pass=Arguments |& FileCheck %s
-;RUN: opt -S -O3 -debug-pass=Arguments |& FileCheck %s
+;RUN: opt -S -O1 -debug-pass=Arguments 2>&1 | FileCheck %s
+;RUN: opt -S -O2 -debug-pass=Arguments 2>&1 | FileCheck %s
+;RUN: opt -S -Os -debug-pass=Arguments 2>&1 | FileCheck %s
+;RUN: opt -S -Oz -debug-pass=Arguments 2>&1 | FileCheck %s
+;RUN: opt -S -O3 -debug-pass=Arguments 2>&1 | FileCheck %s
; Just check that we get a non-empty set of passes for each -O opton.
;CHECK: Pass Arguments: {{.*}} -print-module