diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2012-07-02 18:37:59 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2012-07-02 18:37:59 +0000 |
| commit | 49589f0d0e35f643e697ab7ae8a51a530d38b0d8 (patch) | |
| tree | a8ead242b50930da01de9e4a02ac519fe7b5518c /test/Linker | |
| parent | 506bb19d10fd3f1a9486e9c8bef632f13da8fe4a (diff) | |
| download | external_llvm-49589f0d0e35f643e697ab7ae8a51a530d38b0d8.zip external_llvm-49589f0d0e35f643e697ab7ae8a51a530d38b0d8.tar.gz external_llvm-49589f0d0e35f643e697ab7ae8a51a530d38b0d8.tar.bz2 | |
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/Linker')
| -rw-r--r-- | test/Linker/2003-08-24-InheritPtrSize.ll | 2 | ||||
| -rw-r--r-- | test/Linker/link-messages.ll | 2 | ||||
| -rw-r--r-- | test/Linker/module-flags-4-a.ll | 2 | ||||
| -rw-r--r-- | test/Linker/module-flags-5-a.ll | 2 | ||||
| -rw-r--r-- | test/Linker/module-flags-6-a.ll | 2 | ||||
| -rw-r--r-- | test/Linker/redefinition.ll | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/test/Linker/2003-08-24-InheritPtrSize.ll b/test/Linker/2003-08-24-InheritPtrSize.ll index 487172f..51d544b 100644 --- a/test/Linker/2003-08-24-InheritPtrSize.ll +++ b/test/Linker/2003-08-24-InheritPtrSize.ll @@ -3,7 +3,7 @@ ; RUN: llvm-as < %s > %t.out1.bc ; RUN: echo "" | llvm-as > %t.out2.bc -; RUN: llvm-link %t.out1.bc %t.out2.bc |& not grep warning +; RUN: llvm-link %t.out1.bc %t.out2.bc 2>&1 | not grep warning target datalayout = "e-p:64:64" diff --git a/test/Linker/link-messages.ll b/test/Linker/link-messages.ll index 1faae18..4e7ffbc 100644 --- a/test/Linker/link-messages.ll +++ b/test/Linker/link-messages.ll @@ -2,7 +2,7 @@ ; that error is printed out. ; RUN: llvm-as %s -o %t.one.bc ; RUN: llvm-as %s -o %t.two.bc -; RUN: not llvm-link %t.one.bc %t.two.bc -o %t.bc |& FileCheck %s +; RUN: not llvm-link %t.one.bc %t.two.bc -o %t.bc 2>&1 | FileCheck %s ; CHECK: symbol multiply defined define i32 @bar() { diff --git a/test/Linker/module-flags-4-a.ll b/test/Linker/module-flags-4-a.ll index f411a56..a656c8b 100644 --- a/test/Linker/module-flags-4-a.ll +++ b/test/Linker/module-flags-4-a.ll @@ -1,4 +1,4 @@ -; RUN: not llvm-link %s %p/module-flags-4-b.ll -S -o - |& FileCheck %s +; RUN: not llvm-link %s %p/module-flags-4-b.ll -S -o - 2>&1 | FileCheck %s ; Test 'require' error. diff --git a/test/Linker/module-flags-5-a.ll b/test/Linker/module-flags-5-a.ll index 2e59ecc..8d625cd 100644 --- a/test/Linker/module-flags-5-a.ll +++ b/test/Linker/module-flags-5-a.ll @@ -1,4 +1,4 @@ -; RUN: not llvm-link %s %p/module-flags-5-b.ll -S -o - |& FileCheck %s +; RUN: not llvm-link %s %p/module-flags-5-b.ll -S -o - 2>&1 | FileCheck %s ; Test the 'override' error. diff --git a/test/Linker/module-flags-6-a.ll b/test/Linker/module-flags-6-a.ll index c3e0225..5329c43 100644 --- a/test/Linker/module-flags-6-a.ll +++ b/test/Linker/module-flags-6-a.ll @@ -1,4 +1,4 @@ -; RUN: not llvm-link %s %p/module-flags-6-b.ll -S -o - |& FileCheck %s +; RUN: not llvm-link %s %p/module-flags-6-b.ll -S -o - 2>&1 | FileCheck %s ; Test module flags error messages. diff --git a/test/Linker/redefinition.ll b/test/Linker/redefinition.ll index ec7e0a3..23ba6a1 100644 --- a/test/Linker/redefinition.ll +++ b/test/Linker/redefinition.ll @@ -3,8 +3,8 @@ ; RUN: llvm-as %s -o %t.foo1.bc ; RUN: llvm-as %s -o %t.foo2.bc ; RUN: echo "define void @foo(i32 %x) { ret void }" | llvm-as -o %t.foo3.bc -; RUN: not llvm-link %t.foo1.bc %t.foo2.bc -o %t.bc |& \ +; RUN: not llvm-link %t.foo1.bc %t.foo2.bc -o %t.bc 2>&1 | \ ; RUN: grep "symbol multiply defined" -; RUN: not llvm-link %t.foo1.bc %t.foo3.bc -o %t.bc |& \ +; RUN: not llvm-link %t.foo1.bc %t.foo3.bc -o %t.bc 2>&1 | \ ; RUN: grep "symbol multiply defined" define void @foo() { ret void } |