[lld] r356694 - Fix lld wasm tests after r356610

Reid Kleckner via llvm-commits llvm-commits at lists.llvm.org
Thu Mar 21 11:24:05 PDT 2019


Author: rnk
Date: Thu Mar 21 11:24:05 2019
New Revision: 356694

URL: http://llvm.org/viewvc/llvm-project?rev=356694&view=rev
Log:
Fix lld wasm tests after r356610

Apparently stdout is not opened in binary mode, so the executable gets
corrupted when piping to obj2yaml.

Modified:
    lld/trunk/test/wasm/target-feature-disallowed.yaml
    lld/trunk/test/wasm/target-feature-required.yaml
    lld/trunk/test/wasm/target-feature-used.yaml

Modified: lld/trunk/test/wasm/target-feature-disallowed.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/wasm/target-feature-disallowed.yaml?rev=356694&r1=356693&r2=356694&view=diff
==============================================================================
--- lld/trunk/test/wasm/target-feature-disallowed.yaml (original)
+++ lld/trunk/test/wasm/target-feature-disallowed.yaml Thu Mar 21 11:24:05 2019
@@ -1,10 +1,12 @@
 # RUN: yaml2obj %s -o %t1.o
 
 # RUN: yaml2obj %S/Inputs/disallow-feature-foo.yaml -o %t.disallowed.o
-# RUN: wasm-ld --no-entry -o - %t1.o %t.disallowed.o | obj2yaml | FileCheck %s --check-prefix DISALLOWED
+# RUN: wasm-ld --no-entry -o %t.disallowed.exe %t1.o %t.disallowed.o
+# RUN: obj2yaml < %t.disallowed.exe | FileCheck %s --check-prefix DISALLOWED
 
 # RUN: yaml2obj %S/Inputs/no-feature-foo.yaml -o %t.none.o
-# RUN: wasm-ld --no-entry -o - %t1.o %t.none.o | obj2yaml | FileCheck %s --check-prefix NONE
+# RUN: wasm-ld --no-entry -o %t.none.exe %t1.o %t.none.o
+# RUN: obj2yaml < %t.none.exe | FileCheck %s --check-prefix NONE
 
 # Check that the following combinations of feature linkage policies
 # give the expected results:

Modified: lld/trunk/test/wasm/target-feature-required.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/wasm/target-feature-required.yaml?rev=356694&r1=356693&r2=356694&view=diff
==============================================================================
--- lld/trunk/test/wasm/target-feature-required.yaml (original)
+++ lld/trunk/test/wasm/target-feature-required.yaml Thu Mar 21 11:24:05 2019
@@ -1,13 +1,14 @@
 # RUN: yaml2obj %s -o %t1.o
 
 # RUN: yaml2obj %S/Inputs/require-feature-foo.yaml -o %t.required.o
-# RUN: wasm-ld --no-entry -o - %t1.o %t.required.o | obj2yaml | FileCheck %s --check-prefix REQUIRED
+# RUN: wasm-ld --no-entry -o %t.required.exe %t1.o %t.required.o
+# RUN: obj2yaml < %t.required.exe | FileCheck %s --check-prefix REQUIRED
 
 # RUN: yaml2obj %S/Inputs/disallow-feature-foo.yaml -o %t.disallowed.o
-# RUN: not wasm-ld --no-entry -o - %t1.o %t.disallowed.o 2>&1 | FileCheck %s --check-prefix DISALLOWED
+# RUN: not wasm-ld --no-entry -o /dev/null %t1.o %t.disallowed.o 2>&1 | FileCheck %s --check-prefix DISALLOWED
 
 # RUN: yaml2obj %S/Inputs/no-feature-foo.yaml -o %t.none.o
-# RUN: not wasm-ld --no-entry -o - %t1.o %t.none.o 2>&1 | FileCheck %s --check-prefix NONE
+# RUN: not wasm-ld --no-entry -o /dev/null %t1.o %t.none.o 2>&1 | FileCheck %s --check-prefix NONE
 
 # Check that the following combinations of feature linkage policies
 # give the expected results:

Modified: lld/trunk/test/wasm/target-feature-used.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/wasm/target-feature-used.yaml?rev=356694&r1=356693&r2=356694&view=diff
==============================================================================
--- lld/trunk/test/wasm/target-feature-used.yaml (original)
+++ lld/trunk/test/wasm/target-feature-used.yaml Thu Mar 21 11:24:05 2019
@@ -1,16 +1,19 @@
 # RUN: yaml2obj %s -o %t1.o
 
 # RUN: yaml2obj %S/Inputs/use-feature-foo.yaml -o %t.used.o
-# RUN: wasm-ld --no-entry -o - %t1.o %t.used.o | obj2yaml | FileCheck %s --check-prefix USED
+# RUN: wasm-ld --no-entry -o %t.used.exe %t1.o %t.used.o
+# RUN: obj2yaml < %t.used.exe | FileCheck %s --check-prefix USED
 
 # RUN: yaml2obj %S/Inputs/require-feature-foo.yaml -o %t.required.o
-# RUN: wasm-ld --no-entry -o - %t1.o %t.required.o | obj2yaml | FileCheck %s --check-prefix REQUIRED
+# RUN: wasm-ld --no-entry -o %t.required.exe %t1.o %t.required.o
+# RUN: obj2yaml < %t.required.exe | FileCheck %s --check-prefix REQUIRED
 
 # RUN: yaml2obj %S/Inputs/disallow-feature-foo.yaml -o %t.disallowed.o
-# RUN: not wasm-ld --no-entry -o - %t1.o %t.disallowed.o 2>&1 | FileCheck %s --check-prefix DISALLOWED
+# RUN: not wasm-ld --no-entry -o /dev/null %t1.o %t.disallowed.o 2>&1 | FileCheck %s --check-prefix DISALLOWED
 
 # RUN: yaml2obj %S/Inputs/no-feature-foo.yaml -o %t.none.o
-# RUN: wasm-ld --no-entry -o - %t1.o %t.none.o | obj2yaml | FileCheck %s --check-prefix NONE
+# RUN: wasm-ld --no-entry -o %t.none.exe %t1.o %t.none.o
+# RUN: obj2yaml %t.none.exe | FileCheck %s --check-prefix NONE
 
 # Check that the following combinations of feature linkage policies
 # give the expected results:




More information about the llvm-commits mailing list