8 files changed, 36 insertions, 36 deletions
diff --git a/test/spec/exception-handling/binary.txt b/test/spec/exception-handling/binary.txt
index d7c3f171..1a1870ee 100644
--- a/test/spec/exception-handling/binary.txt
+++ b/test/spec/exception-handling/binary.txt
@@ -272,7 +272,7 @@ out/test/spec/exception-handling/binary.wast:1671: assert_malformed passed:
 out/test/spec/exception-handling/binary.wast:1685: assert_malformed passed:
   000001a: error: unfinished section (expected end: 0x1b)
 out/test/spec/exception-handling/binary.wast:1716: assert_malformed passed:
-  error: function type variable out of range: 11 (max 1)
+  out/test/spec/exception-handling/binary/binary.166.wasm:0000025: error: function type variable out of range: 11 (max 1)
   0000025: error: OnBlockExpr callback failed
 out/test/spec/exception-handling/binary.wast:1751: assert_malformed passed:
   0000017: error: multiple Start sections
diff --git a/test/spec/exception-handling/exports.txt b/test/spec/exception-handling/exports.txt
index 8094b2a9..7cea1021 100644
--- a/test/spec/exception-handling/exports.txt
+++ b/test/spec/exception-handling/exports.txt
@@ -12,22 +12,22 @@ out/test/spec/exception-handling/exports.wast:47: assert_invalid passed:
   0000000: error: function variable out of range: 1 (max 1)
   000002e: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:51: assert_invalid passed:
-  error: duplicate export "a"
+  out/test/spec/exception-handling/exports/exports.18.wasm:000001d: error: duplicate export "a"
   000001d: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:55: assert_invalid passed:
-  error: duplicate export "a"
+  out/test/spec/exception-handling/exports/exports.19.wasm:000001e: error: duplicate export "a"
   000001e: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:59: assert_invalid passed:
-  error: duplicate export "a"
+  out/test/spec/exception-handling/exports/exports.20.wasm:0000025: error: duplicate export "a"
   0000025: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:63: assert_invalid passed:
-  error: duplicate export "a"
+  out/test/spec/exception-handling/exports/exports.21.wasm:0000023: error: duplicate export "a"
   0000023: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:67: assert_invalid passed:
-  error: duplicate export "a"
+  out/test/spec/exception-handling/exports/exports.22.wasm:0000022: error: duplicate export "a"
   0000022: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:71: assert_invalid passed:
-  error: duplicate export "t0"
+  out/test/spec/exception-handling/exports/exports.23.wasm:0000022: error: duplicate export "t0"
   0000022: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:100: assert_invalid passed:
   0000000: error: global variable out of range: 0 (max 0)
@@ -39,19 +39,19 @@ out/test/spec/exception-handling/exports.wast:108: assert_invalid passed:
   0000000: error: global variable out of range: 1 (max 1)
   0000029: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:112: assert_invalid passed:
-  error: duplicate export "a"
+  out/test/spec/exception-handling/exports/exports.39.wasm:000001b: error: duplicate export "a"
   000001b: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:116: assert_invalid passed:
-  error: duplicate export "a"
+  out/test/spec/exception-handling/exports/exports.40.wasm:0000020: error: duplicate export "a"
   0000020: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:120: assert_invalid passed:
-  error: duplicate export "a"
+  out/test/spec/exception-handling/exports/exports.41.wasm:0000025: error: duplicate export "a"
   0000025: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:124: assert_invalid passed:
-  error: duplicate export "a"
+  out/test/spec/exception-handling/exports/exports.42.wasm:0000021: error: duplicate export "a"
   0000021: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:128: assert_invalid passed:
-  error: duplicate export "a"
+  out/test/spec/exception-handling/exports/exports.43.wasm:0000020: error: duplicate export "a"
   0000020: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:155: assert_invalid passed:
   0000000: error: table variable out of range: 0 (max 0)
@@ -63,19 +63,19 @@ out/test/spec/exception-handling/exports.wast:163: assert_invalid passed:
   0000000: error: table variable out of range: 1 (max 1)
   0000026: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:167: assert_invalid passed:
-  error: duplicate export "a"
+  out/test/spec/exception-handling/exports/exports.62.wasm:0000019: error: duplicate export "a"
   0000019: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:171: assert_invalid passed:
-  error: duplicate export "a"
+  out/test/spec/exception-handling/exports/exports.63.wasm:000001c: error: duplicate export "a"
   000001c: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:175: assert_invalid passed:
-  error: duplicate export "a"
+  out/test/spec/exception-handling/exports/exports.64.wasm:0000023: error: duplicate export "a"
   0000023: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:179: assert_invalid passed:
-  error: duplicate export "a"
+  out/test/spec/exception-handling/exports/exports.65.wasm:0000021: error: duplicate export "a"
   0000021: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:183: assert_invalid passed:
-  error: duplicate export "a"
+  out/test/spec/exception-handling/exports/exports.66.wasm:000001e: error: duplicate export "a"
   000001e: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:211: assert_invalid passed:
   0000000: error: memory variable out of range: 0 (max 0)
@@ -87,16 +87,16 @@ out/test/spec/exception-handling/exports.wast:219: assert_invalid passed:
   0000000: error: memory variable out of range: 1 (max 1)
   0000026: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:223: assert_invalid passed:
-  error: duplicate export "a"
+  out/test/spec/exception-handling/exports/exports.84.wasm:0000018: error: duplicate export "a"
   0000018: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:232: assert_invalid passed:
-  error: duplicate export "a"
+  out/test/spec/exception-handling/exports/exports.85.wasm:0000022: error: duplicate export "a"
   0000022: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:236: assert_invalid passed:
-  error: duplicate export "a"
+  out/test/spec/exception-handling/exports/exports.86.wasm:0000020: error: duplicate export "a"
   0000020: error: OnExport callback failed
 out/test/spec/exception-handling/exports.wast:240: assert_invalid passed:
-  error: duplicate export "a"
+  out/test/spec/exception-handling/exports/exports.87.wasm:000001e: error: duplicate export "a"
   000001e: error: OnExport callback failed
 41/41 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/exception-handling/imports.txt b/test/spec/exception-handling/imports.txt
index 7d79ad44..9abd3f4c 100644
--- a/test/spec/exception-handling/imports.txt
+++ b/test/spec/exception-handling/imports.txt
@@ -149,13 +149,13 @@ out/test/spec/exception-handling/imports.wast:488: assert_unlinkable passed:
 out/test/spec/exception-handling/imports.wast:506: assert_trap passed: out of bounds memory access: access at 1000000+4 >= max value 65536
 out/test/spec/exception-handling/imports.wast:517: assert_trap passed: out of bounds memory access: access at 1000000+4 >= max value 65536
 out/test/spec/exception-handling/imports.wast:520: assert_invalid passed:
-  error: only one memory block allowed
+  out/test/spec/exception-handling/imports/imports.103.wasm:0000015: error: only one memory block allowed
   0000015: error: OnImportMemory callback failed
 out/test/spec/exception-handling/imports.wast:524: assert_invalid passed:
-  error: only one memory block allowed
+  out/test/spec/exception-handling/imports/imports.104.wasm:0000015: error: only one memory block allowed
   0000015: error: OnMemory callback failed
 out/test/spec/exception-handling/imports.wast:528: assert_invalid passed:
-  error: only one memory block allowed
+  out/test/spec/exception-handling/imports/imports.105.wasm:000000f: error: only one memory block allowed
   000000f: error: OnMemory callback failed
 out/test/spec/exception-handling/imports.wast:543: assert_unlinkable passed:
   error: invalid import "test.unknown"
diff --git a/test/spec/exception-handling/rethrow.txt b/test/spec/exception-handling/rethrow.txt
index fc83fbc0..aca05127 100644
--- a/test/spec/exception-handling/rethrow.txt
+++ b/test/spec/exception-handling/rethrow.txt
@@ -10,13 +10,13 @@ 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:
-  error: rethrow not in try catch block
+  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:
-  error: rethrow not in try catch block
+  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:
-  error: rethrow not in try catch block
+  out/test/spec/exception-handling/rethrow/rethrow.3.wasm:000001b: error: rethrow not in try catch block
   000001b: error: OnRethrowExpr callback failed
 15/15 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/exception-handling/tag.txt b/test/spec/exception-handling/tag.txt
index 57be9071..e07a0539 100644
--- a/test/spec/exception-handling/tag.txt
+++ b/test/spec/exception-handling/tag.txt
@@ -3,7 +3,7 @@
 ;;; ARGS*: --enable-exceptions
 (;; STDOUT ;;;
 out/test/spec/exception-handling/tag.wast:19: assert_invalid passed:
-  error: Tag signature must have 0 results.
+  out/test/spec/exception-handling/tag/tag.2.wasm:0000014: error: Tag signature must have 0 results.
   0000014: error: OnTagType callback failed
 1/1 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/exception-handling/throw.txt b/test/spec/exception-handling/throw.txt
index 1ebd9ae2..dfd7306c 100644
--- a/test/spec/exception-handling/throw.txt
+++ b/test/spec/exception-handling/throw.txt
@@ -11,10 +11,10 @@ out/test/spec/exception-handling/throw.wast:47: assert_invalid passed:
   0000000: 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:
-  error: type mismatch in throw, expected [i32] but got []
+  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:
-  error: type mismatch in throw, expected [i32] but got [i64]
+  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
 10/10 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/exception-handling/try_catch.txt b/test/spec/exception-handling/try_catch.txt
index 6853b6de..931aaabd 100644
--- a/test/spec/exception-handling/try_catch.txt
+++ b/test/spec/exception-handling/try_catch.txt
@@ -19,19 +19,19 @@ out/test/spec/exception-handling/try_catch.wast:224: assert_malformed passed:
   (module (func (try (do) (catch_all) (catch_all))))
                                        ^^^^^^^^^
 out/test/spec/exception-handling/try_catch.wast:230: assert_invalid passed:
-  error: type mismatch in try, expected [i32] but got []
+  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:232: assert_invalid passed:
-  error: type mismatch in try, expected [i32] but got [i64]
+  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:234: assert_invalid passed:
-  error: type mismatch in try catch, expected [] but got [i32]
+  out/test/spec/exception-handling/try_catch/try_catch.8.wasm:0000023: error: type mismatch in try catch, expected [] but got [i32]
   0000023: error: OnEndExpr callback failed
 out/test/spec/exception-handling/try_catch.wast:236: assert_invalid passed:
-  error: type mismatch in try catch, expected [i32] but got [i64]
+  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:241: assert_invalid passed:
-  error: type mismatch in try catch, expected [] but got [i32]
+  out/test/spec/exception-handling/try_catch/try_catch.10.wasm:000001d: error: type mismatch in try catch, expected [] but got [i32]
   000001d: error: OnEndExpr callback failed
 35/35 tests passed.
 ;;; STDOUT ;;)
diff --git a/test/spec/exception-handling/try_delegate.txt b/test/spec/exception-handling/try_delegate.txt
index f309a7e5..2010f27c 100644
--- a/test/spec/exception-handling/try_delegate.txt
+++ b/test/spec/exception-handling/try_delegate.txt
@@ -23,7 +23,7 @@ out/test/spec/exception-handling/try_delegate.wast:133: assert_malformed passed:
   (module (func (try (do) (delegate) (delegate 0))))
                                    ^
 out/test/spec/exception-handling/try_delegate.wast:138: assert_invalid passed:
-  error: invalid depth: 2 (max 1)
+  out/test/spec/exception-handling/try_delegate/try_delegate.5.wasm:000001b: error: invalid depth: 2 (max 1)
   000001b: error: OnDelegateExpr callback failed
 18/18 tests passed.
 ;;; STDOUT ;;)