summaryrefslogtreecommitdiffstats
path: root/llvm/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
commit5da53436d526162bf696ba40df3841a6b5992fbd (patch)
tree061f2e5a2277613b41b14a278e718134527edf99 /llvm/test/Feature
parent9b887d11b5061226d9b19462f13f8e1de54cb4f4 (diff)
downloadbcm5719-llvm-5da53436d526162bf696ba40df3841a6b5992fbd.tar.gz
bcm5719-llvm-5da53436d526162bf696ba40df3841a6b5992fbd.zip
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
Diffstat (limited to 'llvm/test/Feature')
-rw-r--r--llvm/test/Feature/globalredefinition3.ll2
-rw-r--r--llvm/test/Feature/load_module.ll2
2 files changed, 2 insertions, 2 deletions
diff --git a/llvm/test/Feature/globalredefinition3.ll b/llvm/test/Feature/globalredefinition3.ll
index 3a159725a06..2551d932d8a 100644
--- a/llvm/test/Feature/globalredefinition3.ll
+++ b/llvm/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/llvm/test/Feature/load_module.ll b/llvm/test/Feature/load_module.ll
index 05f6c238134..14c1153fa56 100644
--- a/llvm/test/Feature/load_module.ll
+++ b/llvm/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.
OpenPOWER on IntegriCloud