9 files changed, 21 insertions, 18 deletions
diff --git a/test/binary/bad-export-func.txt b/test/binary/bad-export-func.txt
index f1f40378..0ecae4e6 100644
--- a/test/binary/bad-export-func.txt
+++ b/test/binary/bad-export-func.txt
@@ -4,7 +4,8 @@ version
 section(TYPE) { count[1] function params[0] results[0] }
 section(FUNCTION) { count[1] sig[0] }
 section(EXPORT) { count[1] str("foo") func_kind func[1] }
+section(CODE) { count[1] func { locals[0] } }
 (;; STDERR ;;;
-000001b: error: invalid export func index: 1
-000001b: error: invalid export func index: 1
+out/test/binary/bad-export-func/bad-export-func.wasm:000001b: error: function variable out of range: 1 (max 1)
+out/test/binary/bad-export-func/bad-export-func.wasm:000001b: error: function variable out of range: 1 (max 1)
 ;;; STDERR ;;)
diff --git a/test/binary/bad-function-sig.txt b/test/binary/bad-function-sig.txt
index dda1ce22..19f71b31 100644
--- a/test/binary/bad-function-sig.txt
+++ b/test/binary/bad-function-sig.txt
@@ -3,7 +3,8 @@ magic
 version
 section(TYPE) { count[1] function params[1] i32 results[1] i32 }
 section(FUNCTION) { count[1] type[1] }
+section(CODE) { count[1] func { locals[0] } }
 (;; STDERR ;;;
-0000014: error: invalid function signature index: 1
-0000014: error: invalid function signature index: 1
+out/test/binary/bad-function-sig/bad-function-sig.wasm:0000014: error: function type variable out of range: 1 (max 1)
+out/test/binary/bad-function-sig/bad-function-sig.wasm:0000014: error: function type variable out of range: 1 (max 1)
 ;;; STDERR ;;)
diff --git a/test/binary/bad-function-too-many-results.txt b/test/binary/bad-function-too-many-results.txt
index 3886301d..bed2e6ca 100644
--- a/test/binary/bad-function-too-many-results.txt
+++ b/test/binary/bad-function-too-many-results.txt
@@ -3,6 +3,6 @@ magic
 version
 section(TYPE) { count[1] function params[0] results[2] i32 i32 }
 (;; STDERR ;;;
-000000e: error: result count must be 0 or 1
-000000e: error: result count must be 0 or 1
+out/test/binary/bad-function-too-many-results/bad-function-too-many-results.wasm:0000010: error: multiple result values not currently supported.
+out/test/binary/bad-function-too-many-results/bad-function-too-many-results.wasm:0000010: error: multiple result values not currently supported.
 ;;; STDERR ;;)
diff --git a/test/binary/bad-import-sig.txt b/test/binary/bad-import-sig.txt
index 6eb2b6cd..de799835 100644
--- a/test/binary/bad-import-sig.txt
+++ b/test/binary/bad-import-sig.txt
@@ -4,6 +4,6 @@ version
 section(TYPE) { count[1] function params[0] results[1] i32 }
 section(IMPORT) { count[1] str("module") str("func") func_kind type[1] }
 (;; STDERR ;;;
-0000020: error: invalid import signature index
-0000020: error: invalid import signature index
+out/test/binary/bad-import-sig/bad-import-sig.wasm:0000020: error: function type variable out of range: 1 (max 1)
+out/test/binary/bad-import-sig/bad-import-sig.wasm:0000020: error: function type variable out of range: 1 (max 1)
 ;;; STDERR ;;)
diff --git a/test/binary/bad-memory-init-max-size.txt b/test/binary/bad-memory-init-max-size.txt
index efd586f2..76561241 100644
--- a/test/binary/bad-memory-init-max-size.txt
+++ b/test/binary/bad-memory-init-max-size.txt
@@ -8,6 +8,6 @@ section(MEMORY) {
   max[1]
 }
 (;; STDERR ;;;
-000000e: error: memory initial size must be <= max size
-000000e: error: memory initial size must be <= max size
+out/test/binary/bad-memory-init-max-size/bad-memory-init-max-size.wasm:000000e: error: max pages (1) must be >= initial pages (2)
+out/test/binary/bad-memory-init-max-size/bad-memory-init-max-size.wasm:000000e: error: max pages (1) must be >= initial pages (2)
 ;;; STDERR ;;)
diff --git a/test/binary/bad-memory-init-size.txt b/test/binary/bad-memory-init-size.txt
index 458b4521..dfc79dcd 100644
--- a/test/binary/bad-memory-init-size.txt
+++ b/test/binary/bad-memory-init-size.txt
@@ -7,6 +7,6 @@ section(MEMORY) {
   initial[leb_u32(65537)]
 }
 (;; STDERR ;;;
-000000f: error: invalid memory initial size
-000000f: error: invalid memory initial size
+out/test/binary/bad-memory-init-size/bad-memory-init-size.wasm:000000f: error: initial pages (65537) must be <= (65536)
+out/test/binary/bad-memory-init-size/bad-memory-init-size.wasm:000000f: error: initial pages (65537) must be <= (65536)
 ;;; STDERR ;;)
diff --git a/test/binary/bad-memory-max-size.txt b/test/binary/bad-memory-max-size.txt
index 122c51b1..226f5f10 100644
--- a/test/binary/bad-memory-max-size.txt
+++ b/test/binary/bad-memory-max-size.txt
@@ -8,6 +8,6 @@ section(MEMORY) {
   max[leb_u32(65537)]
 }
 (;; STDERR ;;;
-0000010: error: invalid memory max size
-0000010: error: invalid memory max size
+out/test/binary/bad-memory-max-size/bad-memory-max-size.wasm:0000010: error: max pages (65537) must be <= (65536)
+out/test/binary/bad-memory-max-size/bad-memory-max-size.wasm:0000010: error: max pages (65537) must be <= (65536)
 ;;; STDERR ;;)
diff --git a/test/binary/bad-segment-no-memory.txt b/test/binary/bad-segment-no-memory.txt
index d4a8ee5b..74be7372 100644
--- a/test/binary/bad-segment-no-memory.txt
+++ b/test/binary/bad-segment-no-memory.txt
@@ -7,6 +7,6 @@ section(DATA) {
   data[str("hi")]
 }
 (;; STDERR ;;;
-000000b: error: data section without memory section
-000000b: error: data section without memory section
+000000c: error: invalid data segment flags: 0x41
+000000c: error: invalid data segment flags: 0x41
 ;;; STDERR ;;)
diff --git a/test/binary/bad-start-func.txt b/test/binary/bad-start-func.txt
index 30971b0d..cc00d2e1 100644
--- a/test/binary/bad-start-func.txt
+++ b/test/binary/bad-start-func.txt
@@ -4,7 +4,8 @@ version
 section(TYPE) { count[1] function params[0] results[0] }
 section(FUNCTION) { count[1] sig[0] }
 section(START) { func[1] }
+section(CODE) { count[1] func { locals[0] } }
 (;; STDERR ;;;
-0000015: error: invalid start function index: 1
-0000015: error: invalid start function index: 1
+out/test/binary/bad-start-func/bad-start-func.wasm:0000015: error: function variable out of range: 1 (max 1)
+out/test/binary/bad-start-func/bad-start-func.wasm:0000015: error: function variable out of range: 1 (max 1)
 ;;; STDERR ;;)