test: Move legacy exception handling tests (NFC) (#2498)

12 files changed, 119 insertions, 119 deletions

diff --git a/test/spec/exception-handling/legacy/rethrow.txt b/test/spec/exception-handling/legacy/rethrow.txt
new file mode 100644
index 00000000..9004fd3d
--- /dev/null
+++ b/test/spec/exception-handling/legacy/rethrow.txt
@@ -0,0 +1,22 @@
+;;; TOOL: run-interp-spec
+;;; STDIN_FILE: third_party/testsuite/proposals/exception-handling/legacy/rethrow.wast
+;;; ARGS*: --enable-exceptions
+(;; STDOUT ;;;
+out/test/spec/exception-handling/legacy/rethrow.wast:75: assert_exception passed
+out/test/spec/exception-handling/legacy/rethrow.wast:77: assert_exception passed
+out/test/spec/exception-handling/legacy/rethrow.wast:80: assert_exception passed
+out/test/spec/exception-handling/legacy/rethrow.wast:82: assert_exception passed
+out/test/spec/exception-handling/legacy/rethrow.wast:84: assert_exception passed
+out/test/spec/exception-handling/legacy/rethrow.wast:85: assert_exception passed
+out/test/spec/exception-handling/legacy/rethrow.wast:91: assert_exception passed
+out/test/spec/exception-handling/legacy/rethrow.wast:93: assert_invalid passed:
+  out/test/spec/exception-handling/legacy/rethrow/rethrow.1.wasm:0000019: error: rethrow not in try catch block
+  0000019: error: OnRethrowExpr callback failed
+out/test/spec/exception-handling/legacy/rethrow.wast:94: assert_invalid passed:
+  out/test/spec/exception-handling/legacy/rethrow/rethrow.2.wasm:000001b: error: rethrow not in try catch block
+  000001b: error: OnRethrowExpr callback failed
+out/test/spec/exception-handling/legacy/rethrow.wast:95: assert_invalid passed:
+  out/test/spec/exception-handling/legacy/rethrow/rethrow.3.wasm:000001b: error: rethrow not in try catch block
+  000001b: error: OnRethrowExpr callback failed
+16/16 tests passed.
+;;; STDOUT ;;)
diff --git a/test/spec/exception-handling/legacy/throw.txt b/test/spec/exception-handling/legacy/throw.txt
new file mode 100644
index 00000000..e7d56b2b
--- /dev/null
+++ b/test/spec/exception-handling/legacy/throw.txt
@@ -0,0 +1,20 @@
+;;; TOOL: run-interp-spec
+;;; STDIN_FILE: third_party/testsuite/proposals/exception-handling/legacy/throw.wast
+;;; ARGS*: --enable-exceptions
+(;; STDOUT ;;;
+out/test/spec/exception-handling/legacy/throw.wast:38: assert_exception passed
+out/test/spec/exception-handling/legacy/throw.wast:39: assert_exception passed
+out/test/spec/exception-handling/legacy/throw.wast:41: assert_exception passed
+out/test/spec/exception-handling/legacy/throw.wast:42: assert_exception passed
+out/test/spec/exception-handling/legacy/throw.wast:43: assert_exception passed
+out/test/spec/exception-handling/legacy/throw.wast:47: assert_invalid passed:
+  out/test/spec/exception-handling/legacy/throw/throw.1.wasm:0000019: error: tag variable out of range: 0 (max 0)
+  0000019: error: OnThrowExpr callback failed
+out/test/spec/exception-handling/legacy/throw.wast:48: assert_invalid passed:
+  out/test/spec/exception-handling/legacy/throw/throw.2.wasm:0000022: error: type mismatch in throw, expected [i32] but got []
+  0000022: error: OnThrowExpr callback failed
+out/test/spec/exception-handling/legacy/throw.wast:50: assert_invalid passed:
+  out/test/spec/exception-handling/legacy/throw/throw.3.wasm:0000024: error: type mismatch in throw, expected [i32] but got [i64]
+  0000024: error: OnThrowExpr callback failed
+11/11 tests passed.
+;;; STDOUT ;;)
diff --git a/test/spec/exception-handling/legacy/try_catch.txt b/test/spec/exception-handling/legacy/try_catch.txt
new file mode 100644
index 00000000..a1221108
--- /dev/null
+++ b/test/spec/exception-handling/legacy/try_catch.txt
@@ -0,0 +1,39 @@
+;;; TOOL: run-interp-spec
+;;; STDIN_FILE: third_party/testsuite/proposals/exception-handling/legacy/try_catch.wast
+;;; ARGS*: --enable-exceptions --enable-tail-call
+(;; STDOUT ;;;
+out/test/spec/exception-handling/legacy/try_catch.wast:185: assert_trap passed: unreachable executed
+out/test/spec/exception-handling/legacy/try_catch.wast:188: assert_trap passed: integer divide by zero
+out/test/spec/exception-handling/legacy/try_catch.wast:192: assert_exception passed
+out/test/spec/exception-handling/legacy/try_catch.wast:196: assert_exception passed
+out/test/spec/exception-handling/legacy/try_catch.wast:219: assert_exception passed
+out/test/spec/exception-handling/legacy/try_catch.wast:220: assert_exception passed
+out/test/spec/exception-handling/legacy/try_catch.wast:248: assert_malformed passed:
+  out/test/spec/exception-handling/legacy/try_catch/try_catch.3.wat:1:16: error: unexpected token "catch_all", expected an instr.
+  (module (func (catch_all)))
+                 ^^^^^^^^^
+out/test/spec/exception-handling/legacy/try_catch.wast:253: assert_malformed passed:
+  out/test/spec/exception-handling/legacy/try_catch/try_catch.4.wat:1:25: error: unexpected token "catch", expected an instr.
+  (module (tag $e) (func (catch $e)))
+                          ^^^^^
+out/test/spec/exception-handling/legacy/try_catch.wast:258: assert_malformed passed:
+  out/test/spec/exception-handling/legacy/try_catch/try_catch.5.wat:1:38: error: multiple catch_all clauses not allowed
+  (module (func (try (do) (catch_all) (catch_all))))
+                                       ^^^^^^^^^
+out/test/spec/exception-handling/legacy/try_catch.wast:264: assert_invalid passed:
+  out/test/spec/exception-handling/legacy/try_catch/try_catch.6.wasm:000001b: error: type mismatch in try, expected [i32] but got []
+  000001b: error: OnEndExpr callback failed
+out/test/spec/exception-handling/legacy/try_catch.wast:266: assert_invalid passed:
+  out/test/spec/exception-handling/legacy/try_catch/try_catch.7.wasm:000001d: error: type mismatch in try, expected [i32] but got [i64]
+  000001d: error: OnEndExpr callback failed
+out/test/spec/exception-handling/legacy/try_catch.wast:268: assert_invalid passed:
+  out/test/spec/exception-handling/legacy/try_catch/try_catch.8.wasm:0000023: error: type mismatch at end of try catch, expected [] but got [i32]
+  0000023: error: OnEndExpr callback failed
+out/test/spec/exception-handling/legacy/try_catch.wast:270: assert_invalid passed:
+  out/test/spec/exception-handling/legacy/try_catch/try_catch.9.wasm:0000028: error: type mismatch in try catch, expected [i32] but got [i64]
+  0000028: error: OnEndExpr callback failed
+out/test/spec/exception-handling/legacy/try_catch.wast:275: assert_invalid passed:
+  out/test/spec/exception-handling/legacy/try_catch/try_catch.10.wasm:000001d: error: type mismatch at end of try catch, expected [] but got [i32]
+  000001d: error: OnEndExpr callback failed
+42/42 tests passed.
+;;; STDOUT ;;)
diff --git a/test/spec/exception-handling/legacy/try_delegate.txt b/test/spec/exception-handling/legacy/try_delegate.txt
new file mode 100644
index 00000000..c871f275
--- /dev/null
+++ b/test/spec/exception-handling/legacy/try_delegate.txt
@@ -0,0 +1,32 @@
+;;; TOOL: run-interp-spec
+;;; STDIN_FILE: third_party/testsuite/proposals/exception-handling/legacy/try_delegate.wast
+;;; ARGS*: --enable-exceptions --enable-tail-call
+(;; STDOUT ;;;
+out/test/spec/exception-handling/legacy/try_delegate.wast:195: assert_exception passed
+out/test/spec/exception-handling/legacy/try_delegate.wast:198: assert_exception passed
+out/test/spec/exception-handling/legacy/try_delegate.wast:200: assert_exception passed
+out/test/spec/exception-handling/legacy/try_delegate.wast:208: assert_exception passed
+out/test/spec/exception-handling/legacy/try_delegate.wast:209: assert_exception passed
+out/test/spec/exception-handling/legacy/try_delegate.wast:213: assert_exception passed
+out/test/spec/exception-handling/legacy/try_delegate.wast:214: assert_exception passed
+out/test/spec/exception-handling/legacy/try_delegate.wast:222: assert_malformed passed:
+  out/test/spec/exception-handling/legacy/try_delegate/try_delegate.1.wat:1:16: error: unexpected token "delegate", expected an instr.
+  (module (func (delegate 0)))
+                 ^^^^^^^^
+out/test/spec/exception-handling/legacy/try_delegate.wast:227: assert_malformed passed:
+  out/test/spec/exception-handling/legacy/try_delegate/try_delegate.2.wat:1:46: error: unexpected token delegate, expected ).
+  (module (tag $e) (func (try (do) (catch $e) (delegate 0))))
+                                               ^^^^^^^^
+out/test/spec/exception-handling/legacy/try_delegate.wast:232: assert_malformed passed:
+  out/test/spec/exception-handling/legacy/try_delegate/try_delegate.3.wat:1:38: error: unexpected token delegate, expected ).
+  (module (func (try (do) (catch_all) (delegate 0))))
+                                       ^^^^^^^^
+out/test/spec/exception-handling/legacy/try_delegate.wast:237: assert_malformed passed:
+  out/test/spec/exception-handling/legacy/try_delegate/try_delegate.4.wat:1:34: error: unexpected token ")", expected a numeric index or a name (e.g. 12 or $foo).
+  (module (func (try (do) (delegate) (delegate 0))))
+                                   ^
+out/test/spec/exception-handling/legacy/try_delegate.wast:242: assert_invalid passed:
+  out/test/spec/exception-handling/legacy/try_delegate/try_delegate.5.wasm:000001b: error: invalid depth: 2 (max 1)
+  000001b: error: OnDelegateExpr callback failed
+26/26 tests passed.
+;;; STDOUT ;;)
diff --git a/test/spec/exception-handling/rethrow.txt b/test/spec/exception-handling/rethrow.txt
deleted file mode 100644
index c633c428..00000000
--- a/test/spec/exception-handling/rethrow.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-;;; TOOL: run-interp-spec
-;;; STDIN_FILE: third_party/testsuite_legacy/rethrow.wast
-;;; ARGS*: --enable-exceptions
-(;; STDOUT ;;;
-out/test/spec/exception-handling/rethrow.wast:75: assert_exception passed
-out/test/spec/exception-handling/rethrow.wast:77: assert_exception passed
-out/test/spec/exception-handling/rethrow.wast:80: assert_exception passed
-out/test/spec/exception-handling/rethrow.wast:82: assert_exception passed
-out/test/spec/exception-handling/rethrow.wast:84: assert_exception passed
-out/test/spec/exception-handling/rethrow.wast:85: assert_exception passed
-out/test/spec/exception-handling/rethrow.wast:91: assert_exception passed
-out/test/spec/exception-handling/rethrow.wast:93: assert_invalid passed:
-  out/test/spec/exception-handling/rethrow/rethrow.1.wasm:0000019: error: rethrow not in try catch block
-  0000019: error: OnRethrowExpr callback failed
-out/test/spec/exception-handling/rethrow.wast:94: assert_invalid passed:
-  out/test/spec/exception-handling/rethrow/rethrow.2.wasm:000001b: error: rethrow not in try catch block
-  000001b: error: OnRethrowExpr callback failed
-out/test/spec/exception-handling/rethrow.wast:95: assert_invalid passed:
-  out/test/spec/exception-handling/rethrow/rethrow.3.wasm:000001b: error: rethrow not in try catch block
-  000001b: error: OnRethrowExpr callback failed
-16/16 tests passed.
-;;; STDOUT ;;)
diff --git a/test/spec/exception-handling/throw.txt b/test/spec/exception-handling/throw.txt
deleted file mode 100644
index 2f258e1f..00000000
--- a/test/spec/exception-handling/throw.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-;;; TOOL: run-interp-spec
-;;; STDIN_FILE: third_party/testsuite_legacy/throw.wast
-;;; ARGS*: --enable-exceptions
-(;; STDOUT ;;;
-out/test/spec/exception-handling/throw.wast:38: assert_exception passed
-out/test/spec/exception-handling/throw.wast:39: assert_exception passed
-out/test/spec/exception-handling/throw.wast:41: assert_exception passed
-out/test/spec/exception-handling/throw.wast:42: assert_exception passed
-out/test/spec/exception-handling/throw.wast:43: assert_exception passed
-out/test/spec/exception-handling/throw.wast:47: assert_invalid passed:
-  out/test/spec/exception-handling/throw/throw.1.wasm:0000019: error: tag variable out of range: 0 (max 0)
-  0000019: error: OnThrowExpr callback failed
-out/test/spec/exception-handling/throw.wast:48: assert_invalid passed:
-  out/test/spec/exception-handling/throw/throw.2.wasm:0000022: error: type mismatch in throw, expected [i32] but got []
-  0000022: error: OnThrowExpr callback failed
-out/test/spec/exception-handling/throw.wast:50: assert_invalid passed:
-  out/test/spec/exception-handling/throw/throw.3.wasm:0000024: error: type mismatch in throw, expected [i32] but got [i64]
-  0000024: error: OnThrowExpr callback failed
-11/11 tests passed.
-;;; STDOUT ;;)
diff --git a/test/spec/exception-handling/try_catch.txt b/test/spec/exception-handling/try_catch.txt
deleted file mode 100644
index 11ee0c1a..00000000
--- a/test/spec/exception-handling/try_catch.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-;;; TOOL: run-interp-spec
-;;; STDIN_FILE: third_party/testsuite_legacy/try_catch.wast
-;;; ARGS*: --enable-exceptions --enable-tail-call
-(;; STDOUT ;;;
-out/test/spec/exception-handling/try_catch.wast:177: assert_trap passed: unreachable executed
-out/test/spec/exception-handling/try_catch.wast:180: assert_trap passed: integer divide by zero
-out/test/spec/exception-handling/try_catch.wast:184: assert_exception passed
-out/test/spec/exception-handling/try_catch.wast:188: assert_exception passed
-out/test/spec/exception-handling/try_catch.wast:211: assert_exception passed
-out/test/spec/exception-handling/try_catch.wast:212: assert_exception passed
-out/test/spec/exception-handling/try_catch.wast:237: assert_malformed passed:
-  out/test/spec/exception-handling/try_catch/try_catch.3.wat:1:16: error: unexpected token "catch_all", expected an instr.
-  (module (func (catch_all)))
-                 ^^^^^^^^^
-out/test/spec/exception-handling/try_catch.wast:242: assert_malformed passed:
-  out/test/spec/exception-handling/try_catch/try_catch.4.wat:1:25: error: unexpected token "catch", expected an instr.
-  (module (tag $e) (func (catch $e)))
-                          ^^^^^
-out/test/spec/exception-handling/try_catch.wast:247: assert_malformed passed:
-  out/test/spec/exception-handling/try_catch/try_catch.5.wat:1:38: error: multiple catch_all clauses not allowed
-  (module (func (try (do) (catch_all) (catch_all))))
-                                       ^^^^^^^^^
-out/test/spec/exception-handling/try_catch.wast:253: assert_invalid passed:
-  out/test/spec/exception-handling/try_catch/try_catch.6.wasm:000001b: error: type mismatch in try, expected [i32] but got []
-  000001b: error: OnEndExpr callback failed
-out/test/spec/exception-handling/try_catch.wast:255: assert_invalid passed:
-  out/test/spec/exception-handling/try_catch/try_catch.7.wasm:000001d: error: type mismatch in try, expected [i32] but got [i64]
-  000001d: error: OnEndExpr callback failed
-out/test/spec/exception-handling/try_catch.wast:257: assert_invalid passed:
-  out/test/spec/exception-handling/try_catch/try_catch.8.wasm:0000023: error: type mismatch at end of try catch, expected [] but got [i32]
-  0000023: error: OnEndExpr callback failed
-out/test/spec/exception-handling/try_catch.wast:259: assert_invalid passed:
-  out/test/spec/exception-handling/try_catch/try_catch.9.wasm:0000028: error: type mismatch in try catch, expected [i32] but got [i64]
-  0000028: error: OnEndExpr callback failed
-out/test/spec/exception-handling/try_catch.wast:264: assert_invalid passed:
-  out/test/spec/exception-handling/try_catch/try_catch.10.wasm:000001d: error: type mismatch at end of try catch, expected [] but got [i32]
-  000001d: error: OnEndExpr callback failed
-40/40 tests passed.
-;;; STDOUT ;;)
diff --git a/test/spec/exception-handling/try_delegate.txt b/test/spec/exception-handling/try_delegate.txt
deleted file mode 100644
index 998c6158..00000000
--- a/test/spec/exception-handling/try_delegate.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-;;; TOOL: run-interp-spec
-;;; STDIN_FILE: third_party/testsuite_legacy/try_delegate.wast
-;;; ARGS*: --enable-exceptions --enable-tail-call
-(;; STDOUT ;;;
-out/test/spec/exception-handling/try_delegate.wast:155: assert_exception passed
-out/test/spec/exception-handling/try_delegate.wast:158: assert_exception passed
-out/test/spec/exception-handling/try_delegate.wast:160: assert_exception passed
-out/test/spec/exception-handling/try_delegate.wast:168: assert_exception passed
-out/test/spec/exception-handling/try_delegate.wast:169: assert_exception passed
-out/test/spec/exception-handling/try_delegate.wast:173: assert_exception passed
-out/test/spec/exception-handling/try_delegate.wast:174: assert_exception passed
-out/test/spec/exception-handling/try_delegate.wast:177: assert_malformed passed:
-  out/test/spec/exception-handling/try_delegate/try_delegate.1.wat:1:16: error: unexpected token "delegate", expected an instr.
-  (module (func (delegate 0)))
-                 ^^^^^^^^
-out/test/spec/exception-handling/try_delegate.wast:182: assert_malformed passed:
-  out/test/spec/exception-handling/try_delegate/try_delegate.2.wat:1:46: error: unexpected token delegate, expected ).
-  (module (tag $e) (func (try (do) (catch $e) (delegate 0))))
-                                               ^^^^^^^^
-out/test/spec/exception-handling/try_delegate.wast:187: assert_malformed passed:
-  out/test/spec/exception-handling/try_delegate/try_delegate.3.wat:1:38: error: unexpected token delegate, expected ).
-  (module (func (try (do) (catch_all) (delegate 0))))
-                                       ^^^^^^^^
-out/test/spec/exception-handling/try_delegate.wast:192: assert_malformed passed:
-  out/test/spec/exception-handling/try_delegate/try_delegate.4.wat:1:34: error: unexpected token ")", expected a numeric index or a name (e.g. 12 or $foo).
-  (module (func (try (do) (delegate) (delegate 0))))
-                                   ^
-out/test/spec/exception-handling/try_delegate.wast:197: assert_invalid passed:
-  out/test/spec/exception-handling/try_delegate/try_delegate.5.wasm:000001b: error: invalid depth: 2 (max 1)
-  000001b: error: OnDelegateExpr callback failed
-23/23 tests passed.
-;;; STDOUT ;;)
diff --git a/test/wasm2c/spec/exception-handling/rethrow.txt b/test/wasm2c/spec/exception-handling/rethrow.txt
index 47d12732..909d6d20 100644
--- a/test/wasm2c/spec/exception-handling/rethrow.txt
+++ b/test/wasm2c/spec/exception-handling/rethrow.txt
@@ -1,5 +1,5 @@
 ;;; TOOL: run-spec-wasm2c
-;;; STDIN_FILE: third_party/testsuite_legacy/rethrow.wast
+;;; STDIN_FILE: third_party/testsuite/proposals/exception-handling/legacy/rethrow.wast
 ;;; ARGS*: --enable-exceptions
 (;; STDOUT ;;;
 12/12 tests passed.
diff --git a/test/wasm2c/spec/exception-handling/throw.txt b/test/wasm2c/spec/exception-handling/throw.txt
index d624caa8..f4816ec4 100644
--- a/test/wasm2c/spec/exception-handling/throw.txt
+++ b/test/wasm2c/spec/exception-handling/throw.txt
@@ -1,5 +1,5 @@
 ;;; TOOL: run-spec-wasm2c
-;;; STDIN_FILE: third_party/testsuite_legacy/throw.wast
+;;; STDIN_FILE: third_party/testsuite/proposals/exception-handling/legacy/throw.wast
 ;;; ARGS*: --enable-exceptions
 (;; STDOUT ;;;
 7/7 tests passed.
diff --git a/test/wasm2c/spec/exception-handling/try_catch.txt b/test/wasm2c/spec/exception-handling/try_catch.txt
index dde1ae07..18fbe4c2 100644
--- a/test/wasm2c/spec/exception-handling/try_catch.txt
+++ b/test/wasm2c/spec/exception-handling/try_catch.txt
@@ -1,6 +1,6 @@
 ;;; TOOL: run-spec-wasm2c
-;;; STDIN_FILE: third_party/testsuite_legacy/try_catch.wast
+;;; STDIN_FILE: third_party/testsuite/proposals/exception-handling/legacy/try_catch.wast
 ;;; ARGS*: --enable-exceptions --enable-tail-call
 (;; STDOUT ;;;
-29/29 tests passed.
+31/31 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/wasm2c/spec/exception-handling/try_delegate.txt b/test/wasm2c/spec/exception-handling/try_delegate.txt
index d5bc3ba3..d9f0f8dc 100644
--- a/test/wasm2c/spec/exception-handling/try_delegate.txt
+++ b/test/wasm2c/spec/exception-handling/try_delegate.txt
@@ -1,6 +1,6 @@
 ;;; TOOL: run-spec-wasm2c
-;;; STDIN_FILE: third_party/testsuite_legacy/try_delegate.wast
+;;; STDIN_FILE: third_party/testsuite/proposals/exception-handling/legacy/try_delegate.wast
 ;;; ARGS*: --enable-exceptions --enable-tail-call
 (;; STDOUT ;;;
-17/17 tests passed.
+20/20 tests passed.
 ;;; STDOUT ;;)