6 files changed, 34 insertions, 20 deletions
diff --git a/test/binary/unrecognized-layer.txt b/test/binary/unrecognized-layer.txt
new file mode 100644
index 00000000..3ba231dc
--- /dev/null
+++ b/test/binary/unrecognized-layer.txt
@@ -0,0 +1,7 @@
+;;; TOOL: run-gen-wasm-bad
+magic
+0xe 0 0x2 0
+(;; STDERR ;;;
+0000008: error: unsupported wasm layer: 0x2
+0000008: error: unsupported wasm layer: 0x2
+;;; STDERR ;;)
diff --git a/test/binary/unsupported-component.txt b/test/binary/unsupported-component.txt
new file mode 100644
index 00000000..c1167f0d
--- /dev/null
+++ b/test/binary/unsupported-component.txt
@@ -0,0 +1,7 @@
+;;; TOOL: run-gen-wasm-bad
+magic
+0xd 0 0x1 0
+(;; STDERR ;;;
+0000008: error: wasm components are not yet supported in this tool
+0000008: error: wasm components are not yet supported in this tool
+;;; STDERR ;;)
diff --git a/test/spec/binary.txt b/test/spec/binary.txt
index fd20a651..a4cfc29e 100644
--- a/test/spec/binary.txt
+++ b/test/spec/binary.txt
@@ -40,11 +40,11 @@ out/test/spec/binary.wast:31: assert_malformed passed:
 out/test/spec/binary.wast:34: assert_malformed passed:
   0000004: error: bad magic value
 out/test/spec/binary.wast:37: assert_malformed passed:
-  0000004: error: unable to read uint32_t: version
+  0000004: error: unable to read uint16_t: version
 out/test/spec/binary.wast:38: assert_malformed passed:
-  0000004: error: unable to read uint32_t: version
+  0000004: error: unable to read uint16_t: version
 out/test/spec/binary.wast:39: assert_malformed passed:
-  0000004: error: unable to read uint32_t: version
+  0000006: error: unable to read uint16_t: layer
 out/test/spec/binary.wast:40: assert_malformed passed:
   0000008: error: bad wasm file version: 0 (expected 0x1)
 out/test/spec/binary.wast:41: assert_malformed passed:
@@ -54,9 +54,9 @@ out/test/spec/binary.wast:42: assert_malformed passed:
 out/test/spec/binary.wast:43: assert_malformed passed:
   0000008: error: bad wasm file version: 0x100 (expected 0x1)
 out/test/spec/binary.wast:44: assert_malformed passed:
-  0000008: error: bad wasm file version: 0x10000 (expected 0x1)
+  0000008: error: wasm components are not yet supported in this tool
 out/test/spec/binary.wast:45: assert_malformed passed:
-  0000008: error: bad wasm file version: 0x1000000 (expected 0x1)
+  0000008: error: unsupported wasm layer: 0x100
 out/test/spec/binary.wast:48: assert_malformed passed:
   000000a: error: invalid section code: 14
 out/test/spec/binary.wast:49: assert_malformed passed:
diff --git a/test/spec/exception-handling/binary.txt b/test/spec/exception-handling/binary.txt
index 8d253cf7..a289d3be 100644
--- a/test/spec/exception-handling/binary.txt
+++ b/test/spec/exception-handling/binary.txt
@@ -41,11 +41,11 @@ out/test/spec/exception-handling/binary.wast:31: assert_malformed passed:
 out/test/spec/exception-handling/binary.wast:34: assert_malformed passed:
   0000004: error: bad magic value
 out/test/spec/exception-handling/binary.wast:37: assert_malformed passed:
-  0000004: error: unable to read uint32_t: version
+  0000004: error: unable to read uint16_t: version
 out/test/spec/exception-handling/binary.wast:38: assert_malformed passed:
-  0000004: error: unable to read uint32_t: version
+  0000004: error: unable to read uint16_t: version
 out/test/spec/exception-handling/binary.wast:39: assert_malformed passed:
-  0000004: error: unable to read uint32_t: version
+  0000006: error: unable to read uint16_t: layer
 out/test/spec/exception-handling/binary.wast:40: assert_malformed passed:
   0000008: error: bad wasm file version: 0 (expected 0x1)
 out/test/spec/exception-handling/binary.wast:41: assert_malformed passed:
@@ -55,9 +55,9 @@ out/test/spec/exception-handling/binary.wast:42: assert_malformed passed:
 out/test/spec/exception-handling/binary.wast:43: assert_malformed passed:
   0000008: error: bad wasm file version: 0x100 (expected 0x1)
 out/test/spec/exception-handling/binary.wast:44: assert_malformed passed:
-  0000008: error: bad wasm file version: 0x10000 (expected 0x1)
+  0000008: error: wasm components are not yet supported in this tool
 out/test/spec/exception-handling/binary.wast:45: assert_malformed passed:
-  0000008: error: bad wasm file version: 0x1000000 (expected 0x1)
+  0000008: error: unsupported wasm layer: 0x100
 out/test/spec/exception-handling/binary.wast:48: assert_malformed passed:
   000000a: error: invalid section code: 14
 out/test/spec/exception-handling/binary.wast:49: assert_malformed passed:
diff --git a/test/spec/memory64/binary.txt b/test/spec/memory64/binary.txt
index e34a5f79..6b3bfef5 100644
--- a/test/spec/memory64/binary.txt
+++ b/test/spec/memory64/binary.txt
@@ -41,11 +41,11 @@ out/test/spec/memory64/binary.wast:31: assert_malformed passed:
 out/test/spec/memory64/binary.wast:34: assert_malformed passed:
   0000004: error: bad magic value
 out/test/spec/memory64/binary.wast:37: assert_malformed passed:
-  0000004: error: unable to read uint32_t: version
+  0000004: error: unable to read uint16_t: version
 out/test/spec/memory64/binary.wast:38: assert_malformed passed:
-  0000004: error: unable to read uint32_t: version
+  0000004: error: unable to read uint16_t: version
 out/test/spec/memory64/binary.wast:39: assert_malformed passed:
-  0000004: error: unable to read uint32_t: version
+  0000006: error: unable to read uint16_t: layer
 out/test/spec/memory64/binary.wast:40: assert_malformed passed:
   0000008: error: bad wasm file version: 0 (expected 0x1)
 out/test/spec/memory64/binary.wast:41: assert_malformed passed:
@@ -55,9 +55,9 @@ out/test/spec/memory64/binary.wast:42: assert_malformed passed:
 out/test/spec/memory64/binary.wast:43: assert_malformed passed:
   0000008: error: bad wasm file version: 0x100 (expected 0x1)
 out/test/spec/memory64/binary.wast:44: assert_malformed passed:
-  0000008: error: bad wasm file version: 0x10000 (expected 0x1)
+  0000008: error: wasm components are not yet supported in this tool
 out/test/spec/memory64/binary.wast:45: assert_malformed passed:
-  0000008: error: bad wasm file version: 0x1000000 (expected 0x1)
+  0000008: error: unsupported wasm layer: 0x100
 out/test/spec/memory64/binary.wast:48: assert_malformed passed:
   000000a: error: invalid section code: 14
 out/test/spec/memory64/binary.wast:49: assert_malformed passed:
diff --git a/test/spec/multi-memory/binary.txt b/test/spec/multi-memory/binary.txt
index d88e22f5..ed0842c9 100644
--- a/test/spec/multi-memory/binary.txt
+++ b/test/spec/multi-memory/binary.txt
@@ -41,11 +41,11 @@ out/test/spec/multi-memory/binary.wast:31: assert_malformed passed:
 out/test/spec/multi-memory/binary.wast:34: assert_malformed passed:
   0000004: error: bad magic value
 out/test/spec/multi-memory/binary.wast:37: assert_malformed passed:
-  0000004: error: unable to read uint32_t: version
+  0000004: error: unable to read uint16_t: version
 out/test/spec/multi-memory/binary.wast:38: assert_malformed passed:
-  0000004: error: unable to read uint32_t: version
+  0000004: error: unable to read uint16_t: version
 out/test/spec/multi-memory/binary.wast:39: assert_malformed passed:
-  0000004: error: unable to read uint32_t: version
+  0000006: error: unable to read uint16_t: layer
 out/test/spec/multi-memory/binary.wast:40: assert_malformed passed:
   0000008: error: bad wasm file version: 0 (expected 0x1)
 out/test/spec/multi-memory/binary.wast:41: assert_malformed passed:
@@ -55,9 +55,9 @@ out/test/spec/multi-memory/binary.wast:42: assert_malformed passed:
 out/test/spec/multi-memory/binary.wast:43: assert_malformed passed:
   0000008: error: bad wasm file version: 0x100 (expected 0x1)
 out/test/spec/multi-memory/binary.wast:44: assert_malformed passed:
-  0000008: error: bad wasm file version: 0x10000 (expected 0x1)
+  0000008: error: wasm components are not yet supported in this tool
 out/test/spec/multi-memory/binary.wast:45: assert_malformed passed:
-  0000008: error: bad wasm file version: 0x1000000 (expected 0x1)
+  0000008: error: unsupported wasm layer: 0x100
 out/test/spec/multi-memory/binary.wast:48: assert_malformed passed:
   000000a: error: invalid section code: 14
 out/test/spec/multi-memory/binary.wast:49: assert_malformed passed: