summaryrefslogtreecommitdiff
path: root/test/Feature
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/Feature
parent506bb19d10fd3f1a9486e9c8bef632f13da8fe4a (diff)
downloadllvm-49589f0d0e35f643e697ab7ae8a51a530d38b0d8.tar.gz
llvm-49589f0d0e35f643e697ab7ae8a51a530d38b0d8.tar.bz2
llvm-49589f0d0e35f643e697ab7ae8a51a530d38b0d8.tar.xz
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/Feature')
-rw-r--r--test/Feature/globalredefinition3.ll2
-rw-r--r--test/Feature/load_module.ll2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/Feature/globalredefinition3.ll b/test/Feature/globalredefinition3.ll
index 3a159725a0..2551d932d8 100644
--- a/test/Feature/globalredefinition3.ll
+++ b/test/Feature/globalredefinition3.ll
@@ -1,4 +1,4 @@
-; RUN: not llvm-as %s -o /dev/null |& grep "redefinition of global '@B'"
+; RUN: not llvm-as %s -o /dev/null 2>&1 | grep "redefinition of global '@B'"
@B = global i32 7
@B = global i32 7
diff --git a/test/Feature/load_module.ll b/test/Feature/load_module.ll
index 05f6c23813..14c1153fa5 100644
--- a/test/Feature/load_module.ll
+++ b/test/Feature/load_module.ll
@@ -1,6 +1,6 @@
; PR1318
; RUN: opt < %s -load=%llvmshlibdir/LLVMHello%shlibext -hello \
-; RUN: -disable-output |& grep Hello
+; RUN: -disable-output 2>&1 | grep Hello
; REQUIRES: loadable_module
; FIXME: On Cygming, it might fail without building LLVMHello manually.