From 49589f0d0e35f643e697ab7ae8a51a530d38b0d8 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Mon, 2 Jul 2012 18:37:59 +0000 Subject: 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 --- test/YAMLParser/spec-05-02-utf8.data | 2 +- test/YAMLParser/spec-05-10.data | 2 +- test/YAMLParser/spec-05-12.data | 2 +- test/YAMLParser/spec-05-15.data | 2 +- test/YAMLParser/spec-07-03.data | 2 +- test/YAMLParser/spec-07-05.data | 2 +- test/YAMLParser/spec-08-04.data | 2 +- test/YAMLParser/spec-08-06.data | 2 +- test/YAMLParser/spec-09-02.data | 2 +- test/YAMLParser/spec-09-14.data | 2 +- test/YAMLParser/spec-09-21.data | 2 +- test/YAMLParser/spec-10-08.data | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'test/YAMLParser') diff --git a/test/YAMLParser/spec-05-02-utf8.data b/test/YAMLParser/spec-05-02-utf8.data index b306bdb719..028f41bb55 100644 --- a/test/YAMLParser/spec-05-02-utf8.data +++ b/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/test/YAMLParser/spec-05-10.data b/test/YAMLParser/spec-05-10.data index 6788f0bfc3..bab2c1b89c 100644 --- a/test/YAMLParser/spec-05-10.data +++ b/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/test/YAMLParser/spec-05-12.data b/test/YAMLParser/spec-05-12.data index 7dadff76f8..eedfc08cf3 100644 --- a/test/YAMLParser/spec-05-12.data +++ b/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/test/YAMLParser/spec-05-15.data b/test/YAMLParser/spec-05-15.data index cd8421ad27..27dbd8396e 100644 --- a/test/YAMLParser/spec-05-15.data +++ b/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/test/YAMLParser/spec-07-03.data b/test/YAMLParser/spec-07-03.data index 7ca9483016..c4a5299562 100644 --- a/test/YAMLParser/spec-07-03.data +++ b/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/test/YAMLParser/spec-07-05.data b/test/YAMLParser/spec-07-05.data index 279b54afa1..f7cff3a839 100644 --- a/test/YAMLParser/spec-07-05.data +++ b/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/test/YAMLParser/spec-08-04.data b/test/YAMLParser/spec-08-04.data index f13538bc87..73c493d763 100644 --- a/test/YAMLParser/spec-08-04.data +++ b/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/test/YAMLParser/spec-08-06.data b/test/YAMLParser/spec-08-06.data index a811bfdefe..9844f53a4e 100644 --- a/test/YAMLParser/spec-08-06.data +++ b/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/test/YAMLParser/spec-09-02.data b/test/YAMLParser/spec-09-02.data index f69037820e..9d8a58ca33 100644 --- a/test/YAMLParser/spec-09-02.data +++ b/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/test/YAMLParser/spec-09-14.data b/test/YAMLParser/spec-09-14.data index 890f6bf2e7..a83fcd45e2 100644 --- a/test/YAMLParser/spec-09-14.data +++ b/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/test/YAMLParser/spec-09-21.data b/test/YAMLParser/spec-09-21.data index 2bcc28337f..6eb7917a97 100644 --- a/test/YAMLParser/spec-09-21.data +++ b/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/test/YAMLParser/spec-10-08.data b/test/YAMLParser/spec-10-08.data index 5b981e9833..53faeb9e00 100644 --- a/test/YAMLParser/spec-10-08.data +++ b/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. -- cgit v1.2.3