Make run-spec-wasm2c platform-consistent (#2335)

6 files changed, 8 insertions, 69 deletions

diff --git a/test/harness-windows/wasm2c/floating_point.txt b/test/harness-windows/wasm2c/floating_point.txt
deleted file mode 100644
index 75cd8f4a..00000000
--- a/test/harness-windows/wasm2c/floating_point.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-;;; TOOL: run-spec-wasm2c
-;;; ERROR: 1
-;;; PLATFORMS: Windows
-(module
-  (func (export "f32") (param $x f32) (result f32) (local.get $x))
-  (func (export "f64") (param $x f64) (result f64) (local.get $x))
-)
-(assert_return (invoke "f32" (f32.const 0.0)) (f32.const 123.4))
-(assert_return (invoke "f32" (f32.const 123.4)) (f32.const 0.0))
-(assert_return (invoke "f64" (f64.const 0.0)) (f64.const 123.4))
-(assert_return (invoke "f64" (f64.const 123.4)) (f64.const 0.0))
-(;; STDERR ;;;
-Error running "'out/test/harness-windows/wasm2c/floating_point\floating_point.exe'" (1):
-0/4 tests passed.
-
-out/test/harness-windows/wasm2c/floating_point\floating_point-main.c:384: assertion failed: in w2c_floating__point__0__wasm_f32(&floating__point__0__wasm_instance, 0.f): expected 123.400002, got 0.
-out/test/harness-windows/wasm2c/floating_point\floating_point-main.c:387: assertion failed: in w2c_floating__point__0__wasm_f32(&floating__point__0__wasm_instance, 123.400002f): expected 0, got 123.400002.
-out/test/harness-windows/wasm2c/floating_point\floating_point-main.c:390: assertion failed: in w2c_floating__point__0__wasm_f64(&floating__point__0__wasm_instance, 0.0000000000000000): expected 123.40000000000001, got 0.
-out/test/harness-windows/wasm2c/floating_point\floating_point-main.c:393: assertion failed: in w2c_floating__point__0__wasm_f64(&floating__point__0__wasm_instance, 123.40000000000001): expected 0, got 123.40000000000001.
-
-;;; STDERR ;;)
-(;; STDOUT ;;;
-0/4 tests passed.
-;;; STDOUT ;;)
diff --git a/test/harness-windows/wasm2c/simd_formatting.txt b/test/harness-windows/wasm2c/simd_formatting.txt
deleted file mode 100644
index 1c9d9f9a..00000000
--- a/test/harness-windows/wasm2c/simd_formatting.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-;;; TOOL: run-spec-wasm2c
-;;; ERROR: 1
-;;; PLATFORMS: Windows
-(module
-  (func (export "x") (param $x v128) (result v128) (local.get $x))
-)
-(assert_return (invoke "x" (v128.const i8x16 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0x09 0x0A 0x0B 0x0C 0x0D 0x0E 0x0F))
-                           (v128.const i8x16 0xFF 0xFE 0xFD 0xFC 0xFB 0xFA 0xF9 0xF8 0xF7 0xF6 0xF5 0xF4 0xF3 0xF2 0xF1 0xF0))
-(;; STDERR ;;;
-Error running "'out/test/harness-windows/wasm2c/simd_formatting\simd_formatting.exe'" (1):
-0/1 tests passed.
-
-out/test/harness-windows/wasm2c/simd_formatting\simd_formatting-main.c:384: assertion failed: in w2c_simd__formatting__0__wasm_x(&simd__formatting__0__wasm_instance, simde_wasm_i8x16_make(0u,1u,2u,3u,4u,5u,6u,7u,8u,9u,10u,11u,12u,13u,14u,15u)): expected <255 254 253 252 251 250 249 248 247 246 245 244 243 242 241 240 >, got <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 >.
-
-;;; STDERR ;;)
-(;; STDOUT ;;;
-0/1 tests passed.
-;;; STDOUT ;;)
diff --git a/test/harness/wasm2c/floating_point.txt b/test/harness/wasm2c/floating_point.txt
index 8e4180be..d339d66c 100644
--- a/test/harness/wasm2c/floating_point.txt
+++ b/test/harness/wasm2c/floating_point.txt
@@ -1,6 +1,5 @@
 ;;; TOOL: run-spec-wasm2c
 ;;; ERROR: 1
-;;; NOT-PLATFORMS: Windows
 (module
   (func (export "f32") (param $x f32) (result f32) (local.get $x))
   (func (export "f64") (param $x f64) (result f64) (local.get $x))
@@ -10,14 +9,10 @@
 (assert_return (invoke "f64" (f64.const 0.0)) (f64.const 123.4))
 (assert_return (invoke "f64" (f64.const 123.4)) (f64.const 0.0))
 (;; STDERR ;;;
-Error running "out/test/harness/wasm2c/floating_point/floating_point" (1):
-0/4 tests passed.
-
-out/test/harness/wasm2c/floating_point/floating_point-main.c:384: assertion failed: in w2c_floating__point__0__wasm_f32(&floating__point__0__wasm_instance, 0.f): expected 123.400002, got 0.
-out/test/harness/wasm2c/floating_point/floating_point-main.c:387: assertion failed: in w2c_floating__point__0__wasm_f32(&floating__point__0__wasm_instance, 123.400002f): expected 0, got 123.400002.
-out/test/harness/wasm2c/floating_point/floating_point-main.c:390: assertion failed: in w2c_floating__point__0__wasm_f64(&floating__point__0__wasm_instance, 0.0000000000000000): expected 123.40000000000001, got 0.
-out/test/harness/wasm2c/floating_point/floating_point-main.c:393: assertion failed: in w2c_floating__point__0__wasm_f64(&floating__point__0__wasm_instance, 123.40000000000001): expected 0, got 123.40000000000001.
-
+floating_point.txt:7: assertion failed: in w2c_floating__point__0__wasm_f32(&floating__point__0__wasm_instance, 0.f): expected 123.400002, got 0.
+floating_point.txt:8: assertion failed: in w2c_floating__point__0__wasm_f32(&floating__point__0__wasm_instance, 123.400002f): expected 0, got 123.400002.
+floating_point.txt:9: assertion failed: in w2c_floating__point__0__wasm_f64(&floating__point__0__wasm_instance, 0.0000000000000000): expected 123.40000000000001, got 0.
+floating_point.txt:10: assertion failed: in w2c_floating__point__0__wasm_f64(&floating__point__0__wasm_instance, 123.40000000000001): expected 0, got 123.40000000000001.
 ;;; STDERR ;;)
 (;; STDOUT ;;;
 0/4 tests passed.
diff --git a/test/harness/wasm2c/simd_formatting.txt b/test/harness/wasm2c/simd_formatting.txt
index cbfa29f6..c92ca050 100644
--- a/test/harness/wasm2c/simd_formatting.txt
+++ b/test/harness/wasm2c/simd_formatting.txt
@@ -1,17 +1,12 @@
 ;;; TOOL: run-spec-wasm2c
 ;;; ERROR: 1
-;;; NOT-PLATFORMS: Windows
 (module
   (func (export "x") (param $x v128) (result v128) (local.get $x))
 )
 (assert_return (invoke "x" (v128.const i8x16 0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0x09 0x0A 0x0B 0x0C 0x0D 0x0E 0x0F))
                            (v128.const i8x16 0xFF 0xFE 0xFD 0xFC 0xFB 0xFA 0xF9 0xF8 0xF7 0xF6 0xF5 0xF4 0xF3 0xF2 0xF1 0xF0))
 (;; STDERR ;;;
-Error running "out/test/harness/wasm2c/simd_formatting/simd_formatting" (1):
-0/1 tests passed.
-
-out/test/harness/wasm2c/simd_formatting/simd_formatting-main.c:384: assertion failed: in w2c_simd__formatting__0__wasm_x(&simd__formatting__0__wasm_instance, simde_wasm_i8x16_make(0u,1u,2u,3u,4u,5u,6u,7u,8u,9u,10u,11u,12u,13u,14u,15u)): expected <255 254 253 252 251 250 249 248 247 246 245 244 243 242 241 240 >, got <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 >.
-
+simd_formatting.txt:6: assertion failed: in w2c_simd__formatting__0__wasm_x(&simd__formatting__0__wasm_instance, simde_wasm_i8x16_make(0u,1u,2u,3u,4u,5u,6u,7u,8u,9u,10u,11u,12u,13u,14u,15u)): expected <255 254 253 252 251 250 249 248 247 246 245 244 243 242 241 240 >, got <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 >.
 ;;; STDERR ;;)
 (;; STDOUT ;;;
 0/1 tests passed.
diff --git a/test/run-spec-wasm2c.py b/test/run-spec-wasm2c.py
index fdcb01ab..0ab42a04 100755
--- a/test/run-spec-wasm2c.py
+++ b/test/run-spec-wasm2c.py
@@ -24,6 +24,7 @@ import re
 import struct
 import sys
 import shlex
+import subprocess
 
 import find_exe
 import utils
@@ -234,7 +235,7 @@ class CWriter(object):
             self.commands.insert(0, dummy_command)
 
     def _WriteFileAndLine(self, command):
-        self.out_file.write('// %s:%d\n' % (self.source_filename, command['line']))
+        self.out_file.write('#line {line:d} "{name:s}"\n'.format(name=self.source_filename, line=command['line']))
 
     def _WriteIncludes(self):
         idx = 0
@@ -644,11 +645,7 @@ def main(args):
 
             # Run the resulting binary
             if options.run:
-                error = utils.Executable(main_exe).RunWithArgsForError()
-                if error:
-                    print(error, file=sys.stderr)
-                    return 1
-
+                return subprocess.run([main_exe]).returncode
     return 0
 
 
diff --git a/test/utils.py b/test/utils.py
index fab0d4b0..ee33f3c9 100644
--- a/test/utils.py
+++ b/test/utils.py
@@ -94,12 +94,6 @@ class Executable(object):
         if error:
             raise error
 
-    def RunWithArgsForError(self, *args, **kwargs):
-        stdout, stderr, error = self._RunWithArgsInternal(*args, **kwargs)
-        if stdout:
-            sys.stdout.write(stdout)
-        return error
-
     def AppendArg(self, arg):
         self.after_args.append(arg)