Regen WasmSpec test

test/WasmSpec/baselines/address.baseline

@@ -11,7 +11,6 @@
 1701077858
 1717920867
 122
-$action_0 = undefined
 0
 0
 0
@@ -25,7 +24,6 @@ $action_0 = undefined
 0
 0
 0
-$action_1 = undefined
 0
 0
 0
@@ -38,4 +36,4 @@ $action_1 = undefined
 0
 0
 0
-3/3 tests passed.
+6/6 tests passed.

test/WasmSpec/baselines/binary.baseline

@@ -1 +1,2 @@
-0/0 tests passed.
+(5) binary.wast:6: assert_malformed module binary.4.wasm failed. Expected a compile error: TypeError: BufferSource expected
+15/16 tests passed.

test/WasmSpec/baselines/block.baseline

@@ -1 +1 @@
-14/14 tests passed.
+35/35 tests passed.

test/WasmSpec/baselines/br.baseline

@@ -1 +1 @@
-61/61 tests passed.
+68/68 tests passed.

test/WasmSpec/baselines/br_if.baseline

@@ -1 +1 @@
-34/34 tests passed.
+58/58 tests passed.

test/WasmSpec/baselines/br_table.baseline

@@ -1 +1 @@
-143/143 tests passed.
+157/157 tests passed.

test/WasmSpec/baselines/break-drop.baseline

@@ -1 +1 @@
-3/3 tests passed.
+4/4 tests passed.

test/WasmSpec/baselines/call.baseline

@@ -1 +1 @@
-35/35 tests passed.
+48/48 tests passed.

test/WasmSpec/baselines/call_indirect.baseline

@@ -1 +1 @@
-48/48 tests passed.
+64/64 tests passed.

test/WasmSpec/baselines/chakra_i64.baseline

@@ -1 +1 @@
-980/980 tests passed.
+981/981 tests passed.

test/WasmSpec/baselines/comments.baseline

@@ -1 +1 @@
-0/0 tests passed.
+4/4 tests passed.

test/WasmSpec/baselines/conversions.baseline

@@ -1 +1 @@
-351/351 tests passed.
+352/352 tests passed.

test/WasmSpec/baselines/endianness.baseline

@@ -1 +1 @@
-68/68 tests passed.
+69/69 tests passed.

test/WasmSpec/baselines/exports.baseline

@@ -0,0 +1 @@
+80/80 tests passed.

test/WasmSpec/baselines/f32.baseline

@@ -1 +1 @@
-2394/2394 tests passed.
+2395/2395 tests passed.

test/WasmSpec/baselines/f32_cmp.baseline

@@ -1 +1 @@
-1944/1944 tests passed.
+1945/1945 tests passed.

test/WasmSpec/baselines/f64.baseline

@@ -1 +1 @@
-2394/2394 tests passed.
+2395/2395 tests passed.

test/WasmSpec/baselines/f64_cmp.baseline

@@ -1 +1 @@
-1944/1944 tests passed.
+1945/1945 tests passed.

test/WasmSpec/baselines/fac.baseline

@@ -1 +1 @@
-6/6 tests passed.
+7/7 tests passed.

test/WasmSpec/baselines/float_exprs.baseline

@@ -1,11 +1 @@
-$action_0 = undefined
-$action_1 = undefined
-$action_2 = undefined
-$action_3 = undefined
-$action_8 = undefined
-$action_0 = undefined
-$action_1 = undefined
-$action_2 = undefined
-$action_3 = undefined
-$action_8 = undefined
-686/686 tests passed.
+777/777 tests passed.

test/WasmSpec/baselines/float_literals.baseline

@@ -1 +1 @@
-52/52 tests passed.
+53/53 tests passed.

test/WasmSpec/baselines/float_memory.baseline

@@ -1,25 +1 @@
-$action_1 = undefined
-$action_4 = undefined
-$action_5 = undefined
-$action_8 = undefined
-$action_1 = undefined
-$action_4 = undefined
-$action_6 = undefined
-$action_9 = undefined
-$action_1 = undefined
-$action_4 = undefined
-$action_5 = undefined
-$action_8 = undefined
-$action_1 = undefined
-$action_4 = undefined
-$action_6 = undefined
-$action_9 = undefined
-$action_2 = undefined
-$action_5 = undefined
-$action_8 = undefined
-$action_11 = undefined
-$action_2 = undefined
-$action_5 = undefined
-$action_8 = undefined
-$action_11 = undefined
-46/46 tests passed.
+76/76 tests passed.

test/WasmSpec/baselines/float_misc.baseline

@@ -1 +1 @@
-405/405 tests passed.
+406/406 tests passed.

test/WasmSpec/baselines/forward.baseline

@@ -1 +1 @@
-4/4 tests passed.
+5/5 tests passed.

test/WasmSpec/baselines/func.baseline

@@ -1 +1 @@
-66/66 tests passed.
+97/97 tests passed.

test/WasmSpec/baselines/func_ptrs.baseline

@@ -1,3 +1,5 @@
 83
-$action_3 = undefined
-25/25 tests passed.
+(6) func_ptrs.wast:31: assert_invalid module func_ptrs.1.wasm failed. Had a linking error, expected a compile error: TypeError: Object expected
+(7) func_ptrs.wast:32: assert_invalid module func_ptrs.2.wasm failed. Had a linking error, expected a compile error: TypeError: Object expected
+(9) func_ptrs.wast:39: assert_invalid module func_ptrs.4.wasm failed. Had a linking error, expected a compile error: TypeError: Object expected
+33/36 tests passed.

test/WasmSpec/baselines/get_local.baseline

@@ -1 +1 @@
-10/10 tests passed.
+23/23 tests passed.

test/WasmSpec/baselines/globals.baseline

@@ -1 +1,2 @@
-16/16 tests passed.
+(23) globals.wast:75: assert_invalid module globals.6.wasm failed. Had a linking error, expected a compile error: TypeError: Object expected
+26/27 tests passed.

test/WasmSpec/baselines/i32.baseline

@@ -1 +1 @@
-342/342 tests passed.
+343/343 tests passed.

test/WasmSpec/baselines/i64.baseline

@@ -1 +1 @@
-344/344 tests passed.
+345/345 tests passed.

test/WasmSpec/baselines/imports.baseline

@@ -3,4 +3,60 @@
 13
 13
 13
-28/28 tests passed.
+(11) imports.wast:72: assert_unlinkable module imports.8.wasm failed. Expected a linking error: TypeError: Function expected
+(12) imports.wast:76: assert_unlinkable module imports.9.wasm failed. Expected a linking error: TypeError: Function expected
+(13) imports.wast:81: assert_unlinkable module imports.10.wasm failed. Expected a linking error: TypeError: Function called with invalid signature
+(14) imports.wast:85: assert_unlinkable module imports.11.wasm failed. Expected a linking error: TypeError: Function called with invalid signature
+(15) imports.wast:89: assert_unlinkable module imports.12.wasm failed. Expected a linking error: TypeError: Function called with invalid signature
+(16) imports.wast:93: assert_unlinkable module imports.13.wasm failed. Expected a linking error: TypeError: Function called with invalid signature
+(17) imports.wast:97: assert_unlinkable module imports.14.wasm failed. Expected a linking error: TypeError: Function called with invalid signature
+(18) imports.wast:101: assert_unlinkable module imports.15.wasm failed. Expected a linking error: TypeError: Function called with invalid signature
+(19) imports.wast:105: assert_unlinkable module imports.16.wasm failed. Expected a linking error: TypeError: Function called with invalid signature
+(20) imports.wast:109: assert_unlinkable module imports.17.wasm failed. Expected a linking error: TypeError: Function called with invalid signature
+(21) imports.wast:113: assert_unlinkable module imports.18.wasm failed. Expected a linking error: TypeError: Function called with invalid signature
+(22) imports.wast:117: assert_unlinkable module imports.19.wasm failed. Expected a linking error: TypeError: Function called with invalid signature
+(23) imports.wast:121: assert_unlinkable module imports.20.wasm failed. Expected a linking error: TypeError: Function called with invalid signature
+(24) imports.wast:125: assert_unlinkable module imports.21.wasm failed. Expected a linking error: TypeError: Function called with invalid signature
+(25) imports.wast:129: assert_unlinkable module imports.22.wasm failed. Expected a linking error: TypeError: Function called with invalid signature
+(26) imports.wast:133: assert_unlinkable module imports.23.wasm failed. Expected a linking error: TypeError: Function called with invalid signature
+(27) imports.wast:137: assert_unlinkable module imports.24.wasm failed. Expected a linking error: TypeError: Function called with invalid signature
+(28) imports.wast:141: assert_unlinkable module imports.25.wasm failed. Expected a linking error: TypeError: Function called with invalid signature
+(29) imports.wast:146: assert_unlinkable module imports.26.wasm failed. Expected a linking error: TypeError: Function expected
+(30) imports.wast:150: assert_unlinkable module imports.27.wasm failed. Expected a linking error: TypeError: Function expected
+(31) imports.wast:154: assert_unlinkable module imports.28.wasm failed. Expected a linking error: TypeError: Function expected
+(32) imports.wast:158: assert_unlinkable module imports.29.wasm failed. Expected a linking error: TypeError: Function expected
+(33) imports.wast:162: assert_unlinkable module imports.30.wasm failed. Expected a linking error: TypeError: Function expected
+(34) imports.wast:166: assert_unlinkable module imports.31.wasm failed. Expected a linking error: TypeError: Function expected
+(42) imports.wast:199: assert_unlinkable module imports.35.wasm failed. Expected a linking error: TypeError: Import is invalid
+(43) imports.wast:203: assert_unlinkable module imports.36.wasm failed. Expected a linking error: TypeError: Import is invalid
+(44) imports.wast:208: assert_unlinkable module imports.37.wasm failed. Expected a linking error: TypeError: Import is invalid
+(45) imports.wast:212: assert_unlinkable module imports.38.wasm failed. Expected a linking error: TypeError: Import is invalid
+(46) imports.wast:216: assert_unlinkable module imports.39.wasm failed. Expected a linking error: TypeError: Import is invalid
+(47) imports.wast:220: assert_unlinkable module imports.40.wasm failed. Expected a linking error: TypeError: Import is invalid
+(48) imports.wast:224: assert_unlinkable module imports.41.wasm failed. Expected a linking error: TypeError: Import is invalid
+(49) imports.wast:228: assert_unlinkable module imports.42.wasm failed. Expected a linking error: TypeError: Import is invalid
+(76) imports.wast:295: assert_unlinkable module imports.59.wasm failed. Expected a linking error: TypeError: WebAssembly.Table object expected
+(77) imports.wast:299: assert_unlinkable module imports.60.wasm failed. Expected a linking error: TypeError: WebAssembly.Table object expected
+(78) imports.wast:304: assert_unlinkable module imports.61.wasm failed. Expected a linking error: TypeError: WebAssembly.Table object expected
+(79) imports.wast:308: assert_unlinkable module imports.62.wasm failed. Expected a linking error: TypeError: WebAssembly.Table object expected
+(80) imports.wast:312: assert_unlinkable module imports.63.wasm failed. Expected a linking error: TypeError: WebAssembly.Table object expected
+(81) imports.wast:316: assert_unlinkable module imports.64.wasm failed. Expected a linking error: TypeError: WebAssembly.Table object expected
+(82) imports.wast:321: assert_unlinkable module imports.65.wasm failed. Expected a linking error: TypeError: WebAssembly.Table object expected
+(83) imports.wast:325: assert_unlinkable module imports.66.wasm failed. Expected a linking error: TypeError: WebAssembly.Table object expected
+(84) imports.wast:329: assert_unlinkable module imports.67.wasm failed. Expected a linking error: TypeError: WebAssembly.Table object expected
+(85) imports.wast:333: assert_unlinkable module imports.68.wasm failed. Expected a linking error: TypeError: WebAssembly.Table object expected
+(108) imports.wast:388: assert_unlinkable module imports.83.wasm failed. Expected a linking error: TypeError: WebAssembly.Memory object expected
+(109) imports.wast:392: assert_unlinkable module imports.84.wasm failed. Expected a linking error: TypeError: WebAssembly.Memory object expected
+(110) imports.wast:397: assert_unlinkable module imports.85.wasm failed. Expected a linking error: TypeError: WebAssembly.Memory object expected
+(111) imports.wast:401: assert_unlinkable module imports.86.wasm failed. Expected a linking error: TypeError: WebAssembly.Memory object expected
+(112) imports.wast:405: assert_unlinkable module imports.87.wasm failed. Expected a linking error: TypeError: WebAssembly.Memory object expected
+(113) imports.wast:409: assert_unlinkable module imports.88.wasm failed. Expected a linking error: TypeError: WebAssembly.Memory object expected
+(114) imports.wast:414: assert_unlinkable module imports.89.wasm failed. Expected a linking error: TypeError: WebAssembly.Memory object expected
+(115) imports.wast:418: assert_unlinkable module imports.90.wasm failed. Expected a linking error: TypeError: WebAssembly.Memory object expected
+(116) imports.wast:422: assert_unlinkable module imports.91.wasm failed. Expected a linking error: TypeError: WebAssembly.Memory object expected
+(117) imports.wast:426: assert_unlinkable module imports.92.wasm failed. Expected a linking error: TypeError: WebAssembly.Memory object expected
+(118) imports.wast:430: assert_unlinkable module imports.93.wasm failed. Expected a linking error: TypeError: WebAssembly.Memory object expected
+(119) imports.wast:434: assert_unlinkable module imports.94.wasm failed. Expected a linking error: TypeError: WebAssembly.Memory object expected
+(120) imports.wast:439: assert_unlinkable module imports.95.wasm failed. Expected a linking error: TypeError: WebAssembly.Memory object expected
+(121) imports.wast:443: assert_unlinkable module imports.96.wasm failed. Expected a linking error: TypeError: WebAssembly.Memory object expected
+70/126 tests passed.

test/WasmSpec/baselines/int_exprs.baseline

@@ -1 +1 @@
-79/79 tests passed.
+95/95 tests passed.

test/WasmSpec/baselines/int_literals.baseline

@@ -1 +1 @@
-22/22 tests passed.
+23/23 tests passed.

test/WasmSpec/baselines/labels.baseline

@@ -1 +1 @@
-24/24 tests passed.
+28/28 tests passed.

test/WasmSpec/baselines/left-to-right.baseline

@@ -1 +1 @@
-95/95 tests passed.
+96/96 tests passed.

test/WasmSpec/baselines/linking.baseline

@@ -0,0 +1,5 @@
+(10) linking.wast:28: assert_unlinkable module linking.3.wasm failed. Expected a linking error: TypeError: Function called with invalid signature
+(11) linking.wast:32: assert_unlinkable module linking.4.wasm failed. Expected a linking error: TypeError: Function called with invalid signature
+(63) linking.wast:160: assert_unlinkable module linking.10.wasm failed. Expected a linking error: TypeError: WebAssembly.Memory object expected
+(85) linking.wast:233: assert_unlinkable module linking.15.wasm failed. Expected a linking error: TypeError: WebAssembly.Table object expected
+77/81 tests passed.

test/WasmSpec/baselines/loop.baseline

@@ -1 +1 @@
-42/42 tests passed.
+49/49 tests passed.

test/WasmSpec/baselines/memory.baseline

@@ -1 +1,21 @@
-27/27 tests passed.
+(18) memory.wast:26: assert_invalid module memory.14.wasm failed. Had a linking error, expected a compile error: TypeError: Object expected
+(19) memory.wast:27: assert_invalid module memory.15.wasm failed. Had a linking error, expected a compile error: TypeError: Object expected
+(20) memory.wast:28: assert_invalid module memory.16.wasm failed. Had a linking error, expected a compile error: TypeError: Object expected
+(22) memory.wast:35: assert_invalid module memory.18.wasm failed. Had a linking error, expected a compile error: TypeError: Object expected
+(24) memory.wast:49: assert_unlinkable module memory.20.wasm failed. Expected a linking error: TypeError: Data segment is out of range
+(25) memory.wast:53: assert_unlinkable module memory.21.wasm failed. Expected a linking error: TypeError: Data segment is out of range
+(26) memory.wast:62: assert_unlinkable module memory.22.wasm failed. Expected a linking error: TypeError: Data segment is out of range
+(33) memory.wast:80: assert_invalid module memory.29.wasm failed. Had a linking error, expected a compile error: TypeError: Object expected
+(34) memory.wast:84: assert_invalid module memory.30.wasm failed. Had a linking error, expected a compile error: TypeError: Object expected
+(35) memory.wast:88: assert_invalid module memory.31.wasm failed. Had a linking error, expected a compile error: TypeError: Object expected
+(36) memory.wast:92: assert_invalid module memory.32.wasm failed. Had a linking error, expected a compile error: TypeError: Object expected
+(37) memory.wast:96: assert_invalid module memory.33.wasm failed. Had a linking error, expected a compile error: TypeError: Object expected
+(38) memory.wast:100: assert_invalid module memory.34.wasm failed. Had a linking error, expected a compile error: TypeError: Object expected
+(43) memory.wast:111: assert_invalid module memory.39.wasm failed. Had a linking error, expected a compile error: TypeError: Object expected
+(44) memory.wast:115: assert_invalid module memory.40.wasm failed. Had a linking error, expected a compile error: TypeError: Object expected
+(45) memory.wast:119: assert_invalid module memory.41.wasm failed. Had a linking error, expected a compile error: TypeError: Object expected
+(46) memory.wast:123: assert_invalid module memory.42.wasm failed. Had a linking error, expected a compile error: TypeError: Object expected
+(47) memory.wast:127: assert_invalid module memory.43.wasm failed. Had a linking error, expected a compile error: TypeError: Object expected
+(48) memory.wast:131: assert_invalid module memory.44.wasm failed. Had a linking error, expected a compile error: TypeError: Object expected
+(51) memory.wast:143: assert_invalid module memory.47.wasm failed. Had a linking error, expected a compile error: TypeError: Object expected
+56/76 tests passed.

test/WasmSpec/baselines/memory_redundancy.baseline

@@ -1,3 +1 @@
-$action_1 = undefined
-$action_3 = undefined
-3/3 tests passed.
+6/6 tests passed.

test/WasmSpec/baselines/memory_trap.baseline

@@ -1 +1 @@
-13/13 tests passed.
+14/14 tests passed.

test/WasmSpec/baselines/names.baseline

@@ -1,4 +1,3 @@
 42
 123
-$action_0 = undefined
-14/14 tests passed.
+19/19 tests passed.

test/WasmSpec/baselines/nop.baseline

@@ -1 +1 @@
-50/50 tests passed.
+55/55 tests passed.

test/WasmSpec/baselines/resizing.baseline

@@ -1 +1 @@
-32/32 tests passed.
+35/35 tests passed.

test/WasmSpec/baselines/return.baseline

@@ -1 +1 @@
-57/57 tests passed.
+61/61 tests passed.

test/WasmSpec/baselines/select.baseline

@@ -1 +1 @@
-26/26 tests passed.
+28/28 tests passed.

test/WasmSpec/baselines/set_local.baseline

@@ -1 +1 @@
-10/10 tests passed.
+34/34 tests passed.

test/WasmSpec/baselines/skip-stack-guard-page.baseline

@@ -1 +1 @@
-10/10 tests passed.
+11/11 tests passed.

test/WasmSpec/baselines/stack.baseline

@@ -1 +1 @@
-3/3 tests passed.
+4/4 tests passed.

test/WasmSpec/baselines/start.baseline

@@ -1,7 +1,3 @@
-$action_1 = undefined
-$action_3 = undefined
-$action_1 = undefined
-$action_3 = undefined
 1
 2
-6/6 tests passed.
+17/17 tests passed.

test/WasmSpec/baselines/store_retval.baseline

@@ -1 +1 @@
-0/0 tests passed.
+13/13 tests passed.

test/WasmSpec/baselines/switch.baseline

@@ -1 +1 @@
-26/26 tests passed.
+28/28 tests passed.

test/WasmSpec/baselines/tee_local.baseline

@@ -1 +1 @@
-11/11 tests passed.
+35/35 tests passed.

test/WasmSpec/baselines/traps.baseline

@@ -1 +1 @@
-20/20 tests passed.
+24/24 tests passed.

test/WasmSpec/baselines/typecheck.baseline

@@ -1 +1 @@
-0/0 tests passed.
+193/193 tests passed.

test/WasmSpec/baselines/unreachable.baseline

@@ -1 +1 @@
-57/57 tests passed.
+58/58 tests passed.

test/WasmSpec/baselines/unwind.baseline

@@ -1 +1 @@
-38/38 tests passed.
+39/39 tests passed.

test/WasmSpec/convert-test-suite/index.js

@@ -38,7 +38,9 @@ const argv = require("yargs")
       array: true,
       alias: "e",
       description: "Spec tests to exclude from the conversion (use for known failures)",
-      default: []
+      default: [
+        "soft-fail"
+      ]
     },
     rebase: {
       string: true,

test/WasmSpec/rlexe.xml

@@ -196,6 +196,21 @@
       <tags>exclude_dynapogo</tags>
     </default>
   </test>
+  <test>
+    <default>
+      <files>spec.js</files>
+      <baseline>baselines\exports.baseline</baseline>
+      <compile-flags>-wasm -args testsuite-bin\exports.json -endargs</compile-flags>
+    </default>
+  </test>
+  <test>
+    <default>
+      <files>spec.js</files>
+      <baseline>baselines\exports.baseline</baseline>
+      <compile-flags>-wasm -args testsuite-bin\exports.json -endargs -nonative</compile-flags>
+      <tags>exclude_dynapogo</tags>
+    </default>
+  </test>
   <test>
     <default>
       <files>spec.js</files>
@@ -511,6 +526,21 @@
       <tags>exclude_dynapogo</tags>
     </default>
   </test>
+  <test>
+    <default>
+      <files>spec.js</files>
+      <baseline>baselines\linking.baseline</baseline>
+      <compile-flags>-wasm -args testsuite-bin\linking.json -endargs</compile-flags>
+    </default>
+  </test>
+  <test>
+    <default>
+      <files>spec.js</files>
+      <baseline>baselines\linking.baseline</baseline>
+      <compile-flags>-wasm -args testsuite-bin\linking.json -endargs -nonative</compile-flags>
+      <tags>exclude_dynapogo</tags>
+    </default>
+  </test>
   <test>
     <default>
       <files>spec.js</files>

test/WasmSpec/testsuite-bin/address.json

@@ -1,31 +1,9 @@
-{
-  "modules": [{
-    "filename": "address.0.wasm",
-    "commands": [{
-      "type": "action",
-      "name": "$action_0",
-      "file": "address.wast",
-      "line": 30
-    }, {
-      "type": "action",
-      "name": "$action_1",
-      "file": "address.wast",
-      "line": 31
-    }, {
-      "type": "assert_trap",
-      "name": "$assert_trap_2",
-      "file": "address.wast",
-      "line": 32
-    }, {
-      "type": "assert_trap",
-      "name": "$assert_trap_3",
-      "file": "address.wast",
-      "line": 33
-    }, {
-      "type": "assert_trap",
-      "name": "$assert_trap_4",
-      "file": "address.wast",
-      "line": 34
-    }]
-  }]
-}
+{"source_filename": "address.wast",
+ "commands": [
+  {"type": "module", "line": 1, "filename": "address.0.wasm"}, 
+  {"type": "action", "line": 30, "action": {"type": "invoke", "field": "good", "args": [{"type": "i32", "value": "0"}]}}, 
+  {"type": "action", "line": 31, "action": {"type": "invoke", "field": "good", "args": [{"type": "i32", "value": "65507"}]}}, 
+  {"type": "assert_trap", "line": 32, "action": {"type": "invoke", "field": "good", "args": [{"type": "i32", "value": "65508"}]}, "text": "out of bounds memory access"}, 
+  {"type": "assert_trap", "line": 33, "action": {"type": "invoke", "field": "bad", "args": [{"type": "i32", "value": "0"}]}, "text": "out of bounds memory access"}, 
+  {"type": "assert_trap", "line": 34, "action": {"type": "invoke", "field": "bad", "args": [{"type": "i32", "value": "1"}]}, "text": "out of bounds memory access"}
+]}

test/WasmSpec/testsuite-bin/binary.5.wasm

@@ -0,0 +1 @@
+

test/WasmSpec/testsuite-bin/binary.json

@@ -1,15 +1,19 @@
-{
-  "modules": [{
-    "filename": "binary.0.wasm",
-    "commands": []
-  }, {
-    "filename": "binary.1.wasm",
-    "commands": []
-  }, {
-    "filename": "binary.2.wasm",
-    "commands": []
-  }, {
-    "filename": "binary.3.wasm",
-    "commands": []
-  }]
-}
+{"source_filename": "binary.wast",
+ "commands": [
+  {"type": "module", "line": 1, "filename": "binary.0.wasm"}, 
+  {"type": "module", "line": 2, "filename": "binary.1.wasm"}, 
+  {"type": "module", "line": 3, "name": "$M1", "filename": "binary.2.wasm"}, 
+  {"type": "module", "line": 4, "name": "$M2", "filename": "binary.3.wasm"}, 
+  {"type": "assert_malformed", "line": 6, "filename": "binary.4.wasm", "text": "unexpected end"}, 
+  {"type": "assert_malformed", "line": 7, "filename": "binary.5.wasm", "text": "unexpected end"}, 
+  {"type": "assert_malformed", "line": 8, "filename": "binary.6.wasm", "text": "unexpected end"}, 
+  {"type": "assert_malformed", "line": 9, "filename": "binary.7.wasm", "text": "magic header not detected"}, 
+  {"type": "assert_malformed", "line": 10, "filename": "binary.8.wasm", "text": "magic header not detected"}, 
+  {"type": "assert_malformed", "line": 11, "filename": "binary.9.wasm", "text": "magic header not detected"}, 
+  {"type": "assert_malformed", "line": 12, "filename": "binary.10.wasm", "text": "magic header not detected"}, 
+  {"type": "assert_malformed", "line": 14, "filename": "binary.11.wasm", "text": "unexpected end"}, 
+  {"type": "assert_malformed", "line": 15, "filename": "binary.12.wasm", "text": "unexpected end"}, 
+  {"type": "assert_malformed", "line": 16, "filename": "binary.13.wasm", "text": "unexpected end"}, 
+  {"type": "assert_malformed", "line": 17, "filename": "binary.14.wasm", "text": "unknown binary version"}, 
+  {"type": "assert_malformed", "line": 18, "filename": "binary.15.wasm", "text": "unknown binary version"}
+]}

test/WasmSpec/testsuite-bin/block.json

@@ -1,76 +1,38 @@
-{
-  "modules": [{
-    "filename": "block.0.wasm",
-    "commands": [{
-      "type": "assert_return",
-      "name": "$assert_return_0",
-      "file": "block.wast",
-      "line": 114
-    }, {
-      "type": "assert_return",
-      "name": "$assert_return_1",
-      "file": "block.wast",
-      "line": 115
-    }, {
-      "type": "assert_return",
-      "name": "$assert_return_2",
-      "file": "block.wast",
-      "line": 116
-    }, {
-      "type": "assert_return",
-      "name": "$assert_return_3",
-      "file": "block.wast",
-      "line": 117
-    }, {
-      "type": "assert_return",
-      "name": "$assert_return_4",
-      "file": "block.wast",
-      "line": 118
-    }, {
-      "type": "assert_return",
-      "name": "$assert_return_5",
-      "file": "block.wast",
-      "line": 120
-    }, {
-      "type": "assert_return",
-      "name": "$assert_return_6",
-      "file": "block.wast",
-      "line": 121
-    }, {
-      "type": "assert_return",
-      "name": "$assert_return_7",
-      "file": "block.wast",
-      "line": 122
-    }, {
-      "type": "assert_return",
-      "name": "$assert_return_8",
-      "file": "block.wast",
-      "line": 123
-    }, {
-      "type": "assert_return",
-      "name": "$assert_return_9",
-      "file": "block.wast",
-      "line": 125
-    }, {
-      "type": "assert_return",
-      "name": "$assert_return_10",
-      "file": "block.wast",
-      "line": 126
-    }, {
-      "type": "assert_return",
-      "name": "$assert_return_11",
-      "file": "block.wast",
-      "line": 127
-    }, {
-      "type": "assert_return",
-      "name": "$assert_return_12",
-      "file": "block.wast",
-      "line": 128
-    }, {
-      "type": "assert_return",
-      "name": "$assert_return_13",
-      "file": "block.wast",
-      "line": 130
-    }]
-  }]
-}
+{"source_filename": "block.wast",
+ "commands": [
+  {"type": "module", "line": 3, "filename": "block.0.wasm"}, 
+  {"type": "assert_return", "line": 114, "action": {"type": "invoke", "field": "empty", "args": []}, "expected": []}, 
+  {"type": "assert_return", "line": 115, "action": {"type": "invoke", "field": "singular", "args": []}, "expected": [{"type": "i32", "value": "7"}]}, 
+  {"type": "assert_return", "line": 116, "action": {"type": "invoke", "field": "multi", "args": []}, "expected": [{"type": "i32", "value": "8"}]}, 
+  {"type": "assert_return", "line": 117, "action": {"type": "invoke", "field": "nested", "args": []}, "expected": [{"type": "i32", "value": "9"}]}, 
+  {"type": "assert_return", "line": 118, "action": {"type": "invoke", "field": "deep", "args": []}, "expected": [{"type": "i32", "value": "150"}]}, 
+  {"type": "assert_return", "line": 120, "action": {"type": "invoke", "field": "as-unary-operand", "args": []}, "expected": [{"type": "i32", "value": "0"}]}, 
+  {"type": "assert_return", "line": 121, "action": {"type": "invoke", "field": "as-binary-operand", "args": []}, "expected": [{"type": "i32", "value": "12"}]}, 
+  {"type": "assert_return", "line": 122, "action": {"type": "invoke", "field": "as-test-operand", "args": []}, "expected": [{"type": "i32", "value": "0"}]}, 
+  {"type": "assert_return", "line": 123, "action": {"type": "invoke", "field": "as-compare-operand", "args": []}, "expected": [{"type": "i32", "value": "0"}]}, 
+  {"type": "assert_return", "line": 125, "action": {"type": "invoke", "field": "break-bare", "args": []}, "expected": [{"type": "i32", "value": "19"}]}, 
+  {"type": "assert_return", "line": 126, "action": {"type": "invoke", "field": "break-value", "args": []}, "expected": [{"type": "i32", "value": "18"}]}, 
+  {"type": "assert_return", "line": 127, "action": {"type": "invoke", "field": "break-repeated", "args": []}, "expected": [{"type": "i32", "value": "18"}]}, 
+  {"type": "assert_return", "line": 128, "action": {"type": "invoke", "field": "break-inner", "args": []}, "expected": [{"type": "i32", "value": "15"}]}, 
+  {"type": "assert_return", "line": 130, "action": {"type": "invoke", "field": "effects", "args": []}, "expected": [{"type": "i32", "value": "1"}]}, 
+  {"type": "assert_invalid", "line": 133, "filename": "block.1.wasm", "text": "type mismatch"}, 
+  {"type": "assert_invalid", "line": 137, "filename": "block.2.wasm", "text": "type mismatch"}, 
+  {"type": "assert_invalid", "line": 141, "filename": "block.3.wasm", "text": "type mismatch"}, 
+  {"type": "assert_invalid", "line": 145, "filename": "block.4.wasm", "text": "type mismatch"}, 
+  {"type": "assert_invalid", "line": 150, "filename": "block.5.wasm", "text": "type mismatch"}, 
+  {"type": "assert_invalid", "line": 156, "filename": "block.6.wasm", "text": "type mismatch"}, 
+  {"type": "assert_invalid", "line": 162, "filename": "block.7.wasm", "text": "type mismatch"}, 
+  {"type": "assert_invalid", "line": 169, "filename": "block.8.wasm", "text": "type mismatch"}, 
+  {"type": "assert_invalid", "line": 175, "filename": "block.9.wasm", "text": "type mismatch"}, 
+  {"type": "assert_invalid", "line": 182, "filename": "block.10.wasm", "text": "type mismatch"}, 
+  {"type": "assert_invalid", "line": 188, "filename": "block.11.wasm", "text": "type mismatch"}, 
+  {"type": "assert_invalid", "line": 194, "filename": "block.12.wasm", "text": "type mismatch"}, 
+  {"type": "assert_invalid", "line": 200, "filename": "block.13.wasm", "text": "type mismatch"}, 
+  {"type": "assert_invalid", "line": 207, "filename": "block.14.wasm", "text": "type mismatch"}, 
+  {"type": "assert_invalid", "line": 213, "filename": "block.15.wasm", "text": "type mismatch"}, 
+  {"type": "assert_invalid", "line": 220, "filename": "block.16.wasm", "text": "type mismatch"}, 
+  {"type": "assert_invalid", "line": 226, "filename": "block.17.wasm", "text": "type mismatch"}, 
+  {"type": "assert_invalid", "line": 233, "filename": "block.18.wasm", "text": "type mismatch"}, 
+  {"type": "assert_invalid", "line": 240, "filename": "block.19.wasm", "text": "type mismatch"}, 
+  {"type": "assert_invalid", "line": 246, "filename": "block.20.wasm", "text": "type mismatch"}
+]}