[LLD] Restore tests that use "-" as output

No longer require workarounds for output to "-" (stdout) for Windows. These workarounds were just hiding the actual problem which has been fixed in r357058. Differential Revision: https://reviews.llvm.org/D59824 llvm-svn: 357072
llvm · Mar 27, 2019 · e6b6ab2 · e6b6ab2
1 parent 88efba8
commit e6b6ab2
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 38 deletions.
diff --git a/lld/test/ELF/stdout.s b/lld/test/ELF/stdout.s
@@ -8,10 +8,7 @@
 # CHECK: 201000: 90 nop
 
 # RUN: ld.lld %t.o -o %t2
-
-# FIXME: Add "RUN" in front of this line once the test passes on Windows
-# with it.
-# diff %t1 %t2
+# RUN: diff %t1 %t2
 
 .globl _start
 _start:

diff --git a/lld/test/wasm/target-feature-disallowed.yaml b/lld/test/wasm/target-feature-disallowed.yaml
@@ -7,12 +7,10 @@
 # RUN: obj2yaml %t.unspecified.wasm | FileCheck %s --check-prefix UNSPECIFIED
 
 # RUN: yaml2obj %S/Inputs/disallow-feature-foo.yaml -o %t.disallowed.o
-# RUN: wasm-ld --no-entry -o %t.disallowed.wasm %t1.o %t.disallowed.o
-# RUN: obj2yaml %t.disallowed.wasm | FileCheck %s --check-prefix DISALLOWED
+# RUN: wasm-ld --no-entry -o - %t1.o %t.disallowed.o | obj2yaml | FileCheck %s --check-prefix DISALLOWED
 
 # RUN: yaml2obj %S/Inputs/no-feature-foo.yaml -o %t.none.o
-# RUN: wasm-ld --no-entry -o %t.none.wasm %t1.o %t.none.o
-# RUN: obj2yaml %t.none.wasm | FileCheck %s --check-prefix NONE
+# RUN: wasm-ld --no-entry -o - %t1.o %t.none.o | obj2yaml | FileCheck %s --check-prefix NONE
 
 # Check that the following combinations of feature linkage policies
 # give the expected results:

diff --git a/lld/test/wasm/target-feature-none.yaml b/lld/test/wasm/target-feature-none.yaml
@@ -1,13 +1,10 @@
 # RUN: yaml2obj %s -o %t1.o
 
-# RUN: wasm-ld --no-entry -o %t.empty.wasm %t1.o
-# RUN: obj2yaml %t.empty.wasm | FileCheck %s --check-prefix EMPTY
+# RUN: wasm-ld --no-entry -o - %t1.o | obj2yaml | FileCheck %s --check-prefix EMPTY
 
-# RUN: wasm-ld --no-entry --features= -o %t.empty.2.wasm %t1.o
-# RUN: obj2yaml %t.empty.2.wasm | FileCheck %s --check-prefix EMPTY
+# RUN: wasm-ld --no-entry --features= -o - %t1.o | obj2yaml | FileCheck %s --check-prefix EMPTY
 
-# RUN: wasm-ld --no-entry --features=foo,bar,baz -o %t.specified.wasm %t1.o
-# RUN: obj2yaml %t.specified.wasm | FileCheck %s --check-prefix SPECIFIED
+# RUN: wasm-ld --no-entry --features=foo,bar,baz -o - %t1.o | obj2yaml | FileCheck %s --check-prefix SPECIFIED
 
 --- !WASM
 FileHeader:

diff --git a/lld/test/wasm/target-feature-required.yaml b/lld/test/wasm/target-feature-required.yaml
@@ -1,28 +1,23 @@
 # RUN: yaml2obj %s -o %t1.o
 
-# RUN: wasm-ld --no-entry --features=foo,bar,baz -o %t.specified.wasm %t1.o
-# RUN: obj2yaml %t.specified.wasm | FileCheck %s --check-prefix SPECIFIED
+# RUN: wasm-ld --no-entry --features=foo,bar,baz -o - %t1.o | obj2yaml | FileCheck %s --check-prefix SPECIFIED
 
-# RUN: not wasm-ld --no-entry --features=bar,baz,quux -o - %t1.o 2>&1 | FileCheck %s --check-prefix UNSPECIFIED
+# RUN: not wasm-ld --no-entry --features=bar,baz,quux -o /dev/null %t1.o 2>&1 | FileCheck %s --check-prefix UNSPECIFIED
 
-# RUN: wasm-ld --no-entry --no-check-features --features=bar,baz,quux -o %t.unspecified.wasm %t1.o
-# RUN: obj2yaml %t.unspecified.wasm | FileCheck %s --check-prefix UNSPECIFIED-NOCHECK
+# RUN: wasm-ld --no-entry --no-check-features --features=bar,baz,quux -o - %t1.o | obj2yaml | FileCheck %s --check-prefix UNSPECIFIED-NOCHECK
 
 # RUN: yaml2obj %S/Inputs/require-feature-foo.yaml -o %t.required.o
-# RUN: wasm-ld --no-entry -o %t.required.wasm %t1.o %t.required.o
-# RUN: obj2yaml %t.required.wasm | FileCheck %s --check-prefix REQUIRED
+# RUN: wasm-ld --no-entry -o - %t1.o %t.required.o | obj2yaml | FileCheck %s --check-prefix REQUIRED
 
 # RUN: yaml2obj %S/Inputs/disallow-feature-foo.yaml -o %t.disallowed.o
 # RUN: not wasm-ld --no-entry -o /dev/null %t1.o %t.disallowed.o 2>&1 | FileCheck %s --check-prefix DISALLOWED
 
-# RUN: wasm-ld --no-entry --no-check-features -o %t.disallowed.wasm %t1.o %t.disallowed.o
-# RUN: obj2yaml %t.disallowed.wasm | FileCheck %s --check-prefix DISALLOWED-NOCHECK
+# RUN: wasm-ld --no-entry --no-check-features -o - %t1.o %t.disallowed.o | obj2yaml | FileCheck %s --check-prefix DISALLOWED-NOCHECK
 
 # RUN: yaml2obj %S/Inputs/no-feature-foo.yaml -o %t.none.o
 # RUN: not wasm-ld --no-entry -o /dev/null %t1.o %t.none.o 2>&1 | FileCheck %s --check-prefix NONE
 
-# RUN: wasm-ld --no-entry --no-check-features -o %t.none.wasm %t1.o %t.none.o
-# RUN: obj2yaml %t.none.wasm | FileCheck %s --check-prefix NONE-NOCHECK
+# RUN: wasm-ld --no-entry --no-check-features -o - %t1.o %t.none.o | obj2yaml | FileCheck %s --check-prefix NONE-NOCHECK
 
 # Check that the following combinations of feature linkage policies
 # give the expected results:

diff --git a/lld/test/wasm/target-feature-used.yaml b/lld/test/wasm/target-feature-used.yaml
@@ -1,30 +1,24 @@
 # RUN: yaml2obj %s -o %t1.o
 
-# RUN: wasm-ld --no-entry --features=foo,bar,baz -o %t.specified.wasm %t1.o
-# RUN: obj2yaml %t.specified.wasm | FileCheck %s --check-prefix SPECIFIED
+# RUN: wasm-ld --no-entry --features=foo,bar,baz -o - %t1.o | obj2yaml | FileCheck %s --check-prefix SPECIFIED
 
-# RUN: not wasm-ld --no-entry --features=bar,baz,quux -o - %t1.o 2>&1 | FileCheck %s --check-prefix UNSPECIFIED
+# RUN: not wasm-ld --no-entry --features=bar,baz,quux -o /dev/null %t1.o 2>&1 | FileCheck %s --check-prefix UNSPECIFIED
 
-# RUN: wasm-ld --no-entry --no-check-features --features=bar,baz,quux -o %t.unspecified.wasm %t1.o
-# RUN: obj2yaml %t.unspecified.wasm| FileCheck %s --check-prefix UNSPECIFIED-NOCHECK
+# RUN: wasm-ld --no-entry --no-check-features --features=bar,baz,quux -o - %t1.o | obj2yaml | FileCheck %s --check-prefix UNSPECIFIED-NOCHECK
 
 # RUN: yaml2obj %S/Inputs/use-feature-foo.yaml -o %t.used.o
-# RUN: wasm-ld --no-entry -o %t.used.wasm %t1.o %t.used.o
-# RUN: obj2yaml %t.used.wasm | FileCheck %s --check-prefix USED
+# RUN: wasm-ld --no-entry -o - %t1.o %t.used.o | obj2yaml | FileCheck %s --check-prefix USED
 
 # RUN: yaml2obj %S/Inputs/require-feature-foo.yaml -o %t.required.o
-# RUN: wasm-ld --no-entry -o %t.required.wasm %t1.o %t.required.o
-# RUN: obj2yaml %t.required.wasm | FileCheck %s --check-prefix REQUIRED
+# RUN: wasm-ld --no-entry -o - %t1.o %t.required.o | obj2yaml | FileCheck %s --check-prefix REQUIRED
 
 # RUN: yaml2obj %S/Inputs/disallow-feature-foo.yaml -o %t.disallowed.o
 # RUN: not wasm-ld --no-entry -o /dev/null %t1.o %t.disallowed.o 2>&1 | FileCheck %s --check-prefix DISALLOWED
 
-# RUN: wasm-ld --no-entry --no-check-features -o %t.disallowed.wasm %t1.o %t.disallowed.o
-# RUN: obj2yaml %t.disallowed.wasm | FileCheck %s --check-prefix DISALLOWED-NOCHECK
+# RUN: wasm-ld --no-entry --no-check-features -o - %t1.o %t.disallowed.o | obj2yaml | FileCheck %s --check-prefix DISALLOWED-NOCHECK
 
 # RUN: yaml2obj %S/Inputs/no-feature-foo.yaml -o %t.none.o
-# RUN: wasm-ld --no-entry -o %t.none.wasm %t1.o %t.none.o
-# RUN: obj2yaml %t.none.wasm | FileCheck %s --check-prefix NONE
+# RUN: wasm-ld --no-entry -o - %t1.o %t.none.o | obj2yaml | FileCheck %s --check-prefix NONE
 
 # Check that the following combinations of feature linkage policies
 # give the expected results: