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

12 files changed, 12 insertions, 12 deletions

diff --git a/llvm/test/YAMLParser/spec-05-02-utf8.data b/llvm/test/YAMLParser/spec-05-02-utf8.data
index b306bdb719e..028f41bb557 100644
--- a/llvm/test/YAMLParser/spec-05-02-utf8.data
+++ b/llvm/test/YAMLParser/spec-05-02-utf8.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 
 # Invalid use of BOM
 # inside a
diff --git a/llvm/test/YAMLParser/spec-05-10.data b/llvm/test/YAMLParser/spec-05-10.data
index 6788f0bfc31..bab2c1b89ca 100644
--- a/llvm/test/YAMLParser/spec-05-10.data
+++ b/llvm/test/YAMLParser/spec-05-10.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 
 commercial-at: @text
 grave-accent: `text
diff --git a/llvm/test/YAMLParser/spec-05-12.data b/llvm/test/YAMLParser/spec-05-12.data
index 7dadff76f8d..eedfc08cf38 100644
--- a/llvm/test/YAMLParser/spec-05-12.data
+++ b/llvm/test/YAMLParser/spec-05-12.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 #
 # We don't currently reject tabs as indentation.
 # XFAIL: *
diff --git a/llvm/test/YAMLParser/spec-05-15.data b/llvm/test/YAMLParser/spec-05-15.data
index cd8421ad279..27dbd8396ea 100644
--- a/llvm/test/YAMLParser/spec-05-15.data
+++ b/llvm/test/YAMLParser/spec-05-15.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 
 Bad escapes:
   "\c
diff --git a/llvm/test/YAMLParser/spec-07-03.data b/llvm/test/YAMLParser/spec-07-03.data
index 7ca94830169..c4a5299562a 100644
--- a/llvm/test/YAMLParser/spec-07-03.data
+++ b/llvm/test/YAMLParser/spec-07-03.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 
 %YAML 1.1
 %YAML 1.1
diff --git a/llvm/test/YAMLParser/spec-07-05.data b/llvm/test/YAMLParser/spec-07-05.data
index 279b54afa14..f7cff3a8390 100644
--- a/llvm/test/YAMLParser/spec-07-05.data
+++ b/llvm/test/YAMLParser/spec-07-05.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 #
 # We don't currently parse TAG directives.
 # XFAIL: *
diff --git a/llvm/test/YAMLParser/spec-08-04.data b/llvm/test/YAMLParser/spec-08-04.data
index f13538bc87e..73c493d7637 100644
--- a/llvm/test/YAMLParser/spec-08-04.data
+++ b/llvm/test/YAMLParser/spec-08-04.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 #
 # We don't currently look at the content of literal tags.
 # XFAIL: *
diff --git a/llvm/test/YAMLParser/spec-08-06.data b/llvm/test/YAMLParser/spec-08-06.data
index a811bfdefe3..9844f53a4ef 100644
--- a/llvm/test/YAMLParser/spec-08-06.data
+++ b/llvm/test/YAMLParser/spec-08-06.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 #
 # We don't currently validate tags.
 # XFAIL: *
diff --git a/llvm/test/YAMLParser/spec-09-02.data b/llvm/test/YAMLParser/spec-09-02.data
index f69037820eb..9d8a58ca33a 100644
--- a/llvm/test/YAMLParser/spec-09-02.data
+++ b/llvm/test/YAMLParser/spec-09-02.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 #
 # Indent trimming is not yet implemented.
 # XFAIL: *
diff --git a/llvm/test/YAMLParser/spec-09-14.data b/llvm/test/YAMLParser/spec-09-14.data
index 890f6bf2e71..a83fcd45e2c 100644
--- a/llvm/test/YAMLParser/spec-09-14.data
+++ b/llvm/test/YAMLParser/spec-09-14.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 #
 # Not quite sure why this doesn't fail.
 # XFAIL: *
diff --git a/llvm/test/YAMLParser/spec-09-21.data b/llvm/test/YAMLParser/spec-09-21.data
index 2bcc28337f9..6eb7917a97e 100644
--- a/llvm/test/YAMLParser/spec-09-21.data
+++ b/llvm/test/YAMLParser/spec-09-21.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 
 - |
 
diff --git a/llvm/test/YAMLParser/spec-10-08.data b/llvm/test/YAMLParser/spec-10-08.data
index 5b981e98339..53faeb9e001 100644
--- a/llvm/test/YAMLParser/spec-10-08.data
+++ b/llvm/test/YAMLParser/spec-10-08.data
@@ -1,4 +1,4 @@
-# RUN: yaml-bench -canonical %s |& FileCheck %s
+# RUN: yaml-bench -canonical %s 2>&1 | FileCheck %s
 #
 # This fails because even without a key token, some contexts (in this case flow
 # maps) allow implicit null keys, which mix with this in weird ways.