6 files changed, 76 insertions, 0 deletions
diff --git a/test/binary/bad-duplicate-section-around-custom.txt b/test/binary/bad-duplicate-section-around-custom.txt
new file mode 100644
index 00000000..04c20c40
--- /dev/null
+++ b/test/binary/bad-duplicate-section-around-custom.txt
@@ -0,0 +1,12 @@
+;;; ERROR: 1
+;;; TOOL: run-gen-wasm
+magic
+version
+section(TYPE) { count[0] }
+section("foo") { 1 2 3 4 }
+section(TYPE) { count[0] }
+(;; STDERR ;;;
+Error running "wasm2wast":
+error: @0x00000017: section TYPE out of order
+
+;;; STDERR ;;)
diff --git a/test/binary/bad-duplicate-section.txt b/test/binary/bad-duplicate-section.txt
new file mode 100644
index 00000000..5149cba5
--- /dev/null
+++ b/test/binary/bad-duplicate-section.txt
@@ -0,0 +1,11 @@
+;;; ERROR: 1
+;;; TOOL: run-gen-wasm
+magic
+version
+section(TYPE) { count[0] }
+section(TYPE) { count[0] }
+(;; STDERR ;;;
+Error running "wasm2wast":
+error: @0x0000000d: section TYPE out of order
+
+;;; STDERR ;;)
diff --git a/test/binary/bad-extra-end.txt b/test/binary/bad-extra-end.txt
new file mode 100644
index 00000000..3ec6acd9
--- /dev/null
+++ b/test/binary/bad-extra-end.txt
@@ -0,0 +1,20 @@
+;;; ERROR: 1
+;;; TOOL: run-gen-wasm
+magic
+version
+section(TYPE) { count[1] function params[0] results[1] i32 }
+section(FUNCTION) { count[1] type[0] }
+section(CODE) {
+  count[1]
+  func {
+    locals[0]
+    end
+    end
+  }
+}
+(;; STDERR ;;;
+Error running "wasm2wast":
+error: popping empty label stack
+error: @0x0000001a: on_end_expr callback failed
+
+;;; STDERR ;;)
diff --git a/test/binary/bad-op-after-end.txt b/test/binary/bad-op-after-end.txt
new file mode 100644
index 00000000..48f0d923
--- /dev/null
+++ b/test/binary/bad-op-after-end.txt
@@ -0,0 +1,20 @@
+;;; ERROR: 1
+;;; TOOL: run-gen-wasm
+magic
+version
+section(TYPE) { count[1] function params[0] results[1] i32 }
+section(FUNCTION) { count[1] type[0] }
+section(CODE) {
+  count[1]
+  func {
+    locals[0]
+    end
+    nop
+  }
+}
+(;; STDERR ;;;
+Error running "wasm2wast":
+error: accessing stack depth: 0 >= max: 0
+error: @0x0000001a: on_nop_expr callback failed
+
+;;; STDERR ;;)
diff --git a/test/roundtrip/invalid-local-index.txt b/test/roundtrip/invalid-local-index.txt
new file mode 100644
index 00000000..332446dd
--- /dev/null
+++ b/test/roundtrip/invalid-local-index.txt
@@ -0,0 +1,11 @@
+;;; TOOL: run-roundtrip
+;;; FLAGS: --stdout --no-check
+(module
+  (func
+    set_local 0))
+(;; STDOUT ;;;
+(module
+  (type (;0;) (func))
+  (func (;0;) (type 0)
+    set_local 0))
+;;; STDOUT ;;)
diff --git a/test/run-roundtrip.py b/test/run-roundtrip.py
index b40eb852..01059e65 100755
--- a/test/run-roundtrip.py
+++ b/test/run-roundtrip.py
@@ -115,6 +115,7 @@ def main(args):
   parser.add_argument('-p', '--print-cmd', help='print the commands that are run.',
                       action='store_true')
   parser.add_argument('--use-libc-allocator', action='store_true')
+  parser.add_argument('--no-check', action='store_true')
   parser.add_argument('--debug-names', action='store_true')
   parser.add_argument('--generate-names', action='store_true')
   parser.add_argument('file', help='test file.')
@@ -125,6 +126,7 @@ def main(args):
       error_cmdline=options.error_cmdline)
   wast2wasm.AppendOptionalArgs({
     '--debug-names': options.debug_names,
+    '--no-check': options.no_check,
     '--use-libc-allocator': options.use_libc_allocator
   })