test: improve test reporting

Signed-off-by: Henry Gressmann <mail@henrygressmann.de>

6 files changed, 92 insertions, 57 deletions

diff --git a/crates/tinywasm/tests/generated/mvp.csv b/crates/tinywasm/tests/generated/mvp.csv
index 275de67..b9cbcb4 100644
--- a/crates/tinywasm/tests/generated/mvp.csv
+++ b/crates/tinywasm/tests/generated/mvp.csv
@@ -2,4 +2,4 @@
 0.0.4,9258,10909,[{"name":"address.wast","passed":0,"failed":54},{"name":"align.wast","passed":0,"failed":109},{"name":"binary-leb128.wast","passed":66,"failed":25},{"name":"binary.wast","passed":104,"failed":8},{"name":"block.wast","passed":0,"failed":171},{"name":"br.wast","passed":0,"failed":21},{"name":"br_if.wast","passed":0,"failed":30},{"name":"br_table.wast","passed":0,"failed":25},{"name":"call.wast","passed":0,"failed":22},{"name":"call_indirect.wast","passed":0,"failed":56},{"name":"comments.wast","passed":4,"failed":4},{"name":"const.wast","passed":702,"failed":76},{"name":"conversions.wast","passed":0,"failed":93},{"name":"custom.wast","passed":10,"failed":1},{"name":"data.wast","passed":0,"failed":61},{"name":"elem.wast","passed":0,"failed":76},{"name":"endianness.wast","passed":0,"failed":1},{"name":"exports.wast","passed":21,"failed":73},{"name":"f32.wast","passed":1005,"failed":1509},{"name":"f32_bitwise.wast","passed":1,"failed":363},{"name":"f32_cmp.wast","passed":2401,"failed":6},{"name":"f64.wast","passed":1005,"failed":1509},{"name":"f64_bitwise.wast","passed":1,"failed":363},{"name":"f64_cmp.wast","passed":2401,"failed":6},{"name":"fac.wast","passed":0,"failed":2},{"name":"float_exprs.wast","passed":269,"failed":591},{"name":"float_literals.wast","passed":34,"failed":129},{"name":"float_memory.wast","passed":0,"failed":6},{"name":"float_misc.wast","passed":138,"failed":303},{"name":"forward.wast","passed":1,"failed":4},{"name":"func.wast","passed":4,"failed":75},{"name":"func_ptrs.wast","passed":0,"failed":16},{"name":"global.wast","passed":4,"failed":49},{"name":"i32.wast","passed":0,"failed":96},{"name":"i64.wast","passed":0,"failed":42},{"name":"if.wast","passed":0,"failed":118},{"name":"imports.wast","passed":1,"failed":156},{"name":"inline-module.wast","passed":0,"failed":1},{"name":"int_exprs.wast","passed":38,"failed":70},{"name":"int_literals.wast","passed":5,"failed":46},{"name":"labels.wast","passed":1,"failed":28},{"name":"left-to-right.wast","passed":0,"failed":1},{"name":"linking.wast","passed":1,"failed":66},{"name":"load.wast","passed":0,"failed":60},{"name":"local_get.wast","passed":2,"failed":34},{"name":"local_set.wast","passed":5,"failed":48},{"name":"local_tee.wast","passed":0,"failed":42},{"name":"loop.wast","passed":0,"failed":43},{"name":"memory.wast","passed":0,"failed":34},{"name":"memory_grow.wast","passed":0,"failed":19},{"name":"memory_redundancy.wast","passed":0,"failed":1},{"name":"memory_size.wast","passed":0,"failed":6},{"name":"memory_trap.wast","passed":0,"failed":172},{"name":"names.wast","passed":484,"failed":1},{"name":"nop.wast","passed":0,"failed":5},{"name":"return.wast","passed":0,"failed":21},{"name":"select.wast","passed":0,"failed":32},{"name":"skip-stack-guard-page.wast","passed":0,"failed":11},{"name":"stack.wast","passed":0,"failed":2},{"name":"start.wast","passed":0,"failed":10},{"name":"store.wast","passed":0,"failed":59},{"name":"switch.wast","passed":1,"failed":27},{"name":"token.wast","passed":16,"failed":42},{"name":"traps.wast","passed":3,"failed":33},{"name":"type.wast","passed":1,"failed":2},{"name":"unreachable.wast","passed":0,"failed":59},{"name":"unreached-invalid.wast","passed":0,"failed":118},{"name":"unwind.wast","passed":1,"failed":49},{"name":"utf8-custom-section-id.wast","passed":176,"failed":0},{"name":"utf8-import-field.wast","passed":176,"failed":0},{"name":"utf8-import-module.wast","passed":176,"failed":0},{"name":"utf8-invalid-encoding.wast","passed":0,"failed":176}]
 0.0.5,11135,9093,[{"name":"address.wast","passed":1,"failed":259},{"name":"align.wast","passed":108,"failed":48},{"name":"binary-leb128.wast","passed":78,"failed":13},{"name":"binary.wast","passed":107,"failed":5},{"name":"block.wast","passed":170,"failed":53},{"name":"br.wast","passed":20,"failed":77},{"name":"br_if.wast","passed":29,"failed":89},{"name":"br_table.wast","passed":24,"failed":150},{"name":"call.wast","passed":18,"failed":73},{"name":"call_indirect.wast","passed":34,"failed":136},{"name":"comments.wast","passed":5,"failed":3},{"name":"const.wast","passed":778,"failed":0},{"name":"conversions.wast","passed":25,"failed":594},{"name":"custom.wast","passed":10,"failed":1},{"name":"data.wast","passed":22,"failed":39},{"name":"elem.wast","passed":27,"failed":72},{"name":"endianness.wast","passed":1,"failed":68},{"name":"exports.wast","passed":90,"failed":6},{"name":"f32.wast","passed":1018,"failed":1496},{"name":"f32_bitwise.wast","passed":4,"failed":360},{"name":"f32_cmp.wast","passed":2407,"failed":0},{"name":"f64.wast","passed":1018,"failed":1496},{"name":"f64_bitwise.wast","passed":4,"failed":360},{"name":"f64_cmp.wast","passed":2407,"failed":0},{"name":"fac.wast","passed":1,"failed":7},{"name":"float_exprs.wast","passed":275,"failed":625},{"name":"float_literals.wast","passed":112,"failed":51},{"name":"float_memory.wast","passed":0,"failed":90},{"name":"float_misc.wast","passed":138,"failed":303},{"name":"forward.wast","passed":1,"failed":4},{"name":"func.wast","passed":81,"failed":91},{"name":"func_ptrs.wast","passed":7,"failed":29},{"name":"global.wast","passed":50,"failed":60},{"name":"i32.wast","passed":85,"failed":375},{"name":"i64.wast","passed":31,"failed":385},{"name":"if.wast","passed":116,"failed":125},{"name":"imports.wast","passed":23,"failed":160},{"name":"inline-module.wast","passed":1,"failed":0},{"name":"int_exprs.wast","passed":38,"failed":70},{"name":"int_literals.wast","passed":25,"failed":26},{"name":"labels.wast","passed":13,"failed":16},{"name":"left-to-right.wast","passed":0,"failed":96},{"name":"linking.wast","passed":5,"failed":127},{"name":"load.wast","passed":59,"failed":38},{"name":"local_get.wast","passed":18,"failed":18},{"name":"local_set.wast","passed":38,"failed":15},{"name":"local_tee.wast","passed":41,"failed":56},{"name":"loop.wast","passed":42,"failed":78},{"name":"memory.wast","passed":30,"failed":49},{"name":"memory_grow.wast","passed":11,"failed":85},{"name":"memory_redundancy.wast","passed":1,"failed":7},{"name":"memory_size.wast","passed":6,"failed":36},{"name":"memory_trap.wast","passed":1,"failed":181},{"name":"names.wast","passed":484,"failed":2},{"name":"nop.wast","passed":4,"failed":84},{"name":"return.wast","passed":20,"failed":64},{"name":"select.wast","passed":28,"failed":120},{"name":"skip-stack-guard-page.wast","passed":1,"failed":10},{"name":"stack.wast","passed":2,"failed":5},{"name":"start.wast","passed":4,"failed":16},{"name":"store.wast","passed":59,"failed":9},{"name":"switch.wast","passed":2,"failed":26},{"name":"token.wast","passed":39,"failed":19},{"name":"traps.wast","passed":4,"failed":32},{"name":"type.wast","passed":3,"failed":0},{"name":"unreachable.wast","passed":0,"failed":64},{"name":"unreached-invalid.wast","passed":118,"failed":0},{"name":"unwind.wast","passed":9,"failed":41},{"name":"utf8-custom-section-id.wast","passed":176,"failed":0},{"name":"utf8-import-field.wast","passed":176,"failed":0},{"name":"utf8-import-module.wast","passed":176,"failed":0},{"name":"utf8-invalid-encoding.wast","passed":176,"failed":0}]
 0.1.0,17630,2598,[{"name":"address.wast","passed":5,"failed":255},{"name":"align.wast","passed":108,"failed":48},{"name":"binary-leb128.wast","passed":91,"failed":0},{"name":"binary.wast","passed":110,"failed":2},{"name":"block.wast","passed":193,"failed":30},{"name":"br.wast","passed":84,"failed":13},{"name":"br_if.wast","passed":90,"failed":28},{"name":"br_table.wast","passed":25,"failed":149},{"name":"call.wast","passed":29,"failed":62},{"name":"call_indirect.wast","passed":36,"failed":134},{"name":"comments.wast","passed":7,"failed":1},{"name":"const.wast","passed":778,"failed":0},{"name":"conversions.wast","passed":371,"failed":248},{"name":"custom.wast","passed":11,"failed":0},{"name":"data.wast","passed":47,"failed":14},{"name":"elem.wast","passed":50,"failed":49},{"name":"endianness.wast","passed":1,"failed":68},{"name":"exports.wast","passed":92,"failed":4},{"name":"f32.wast","passed":2514,"failed":0},{"name":"f32_bitwise.wast","passed":364,"failed":0},{"name":"f32_cmp.wast","passed":2407,"failed":0},{"name":"f64.wast","passed":2514,"failed":0},{"name":"f64_bitwise.wast","passed":364,"failed":0},{"name":"f64_cmp.wast","passed":2407,"failed":0},{"name":"fac.wast","passed":2,"failed":6},{"name":"float_exprs.wast","passed":761,"failed":139},{"name":"float_literals.wast","passed":163,"failed":0},{"name":"float_memory.wast","passed":6,"failed":84},{"name":"float_misc.wast","passed":437,"failed":4},{"name":"forward.wast","passed":1,"failed":4},{"name":"func.wast","passed":124,"failed":48},{"name":"func_ptrs.wast","passed":10,"failed":26},{"name":"global.wast","passed":51,"failed":59},{"name":"i32.wast","passed":460,"failed":0},{"name":"i64.wast","passed":416,"failed":0},{"name":"if.wast","passed":120,"failed":121},{"name":"imports.wast","passed":74,"failed":109},{"name":"inline-module.wast","passed":1,"failed":0},{"name":"int_exprs.wast","passed":108,"failed":0},{"name":"int_literals.wast","passed":51,"failed":0},{"name":"labels.wast","passed":14,"failed":15},{"name":"left-to-right.wast","passed":1,"failed":95},{"name":"linking.wast","passed":21,"failed":111},{"name":"load.wast","passed":60,"failed":37},{"name":"local_get.wast","passed":32,"failed":4},{"name":"local_set.wast","passed":50,"failed":3},{"name":"local_tee.wast","passed":68,"failed":29},{"name":"loop.wast","passed":93,"failed":27},{"name":"memory.wast","passed":34,"failed":45},{"name":"memory_grow.wast","passed":12,"failed":84},{"name":"memory_redundancy.wast","passed":1,"failed":7},{"name":"memory_size.wast","passed":6,"failed":36},{"name":"memory_trap.wast","passed":2,"failed":180},{"name":"names.wast","passed":485,"failed":1},{"name":"nop.wast","passed":46,"failed":42},{"name":"return.wast","passed":73,"failed":11},{"name":"select.wast","passed":86,"failed":62},{"name":"skip-stack-guard-page.wast","passed":1,"failed":10},{"name":"stack.wast","passed":2,"failed":5},{"name":"start.wast","passed":9,"failed":11},{"name":"store.wast","passed":59,"failed":9},{"name":"switch.wast","passed":2,"failed":26},{"name":"token.wast","passed":58,"failed":0},{"name":"traps.wast","passed":22,"failed":14},{"name":"type.wast","passed":3,"failed":0},{"name":"unreachable.wast","passed":50,"failed":14},{"name":"unreached-invalid.wast","passed":118,"failed":0},{"name":"unwind.wast","passed":35,"failed":15},{"name":"utf8-custom-section-id.wast","passed":176,"failed":0},{"name":"utf8-import-field.wast","passed":176,"failed":0},{"name":"utf8-import-module.wast","passed":176,"failed":0},{"name":"utf8-invalid-encoding.wast","passed":176,"failed":0}]
-0.2.0-alpha.0,17639,2589,[{"name":"address.wast","passed":5,"failed":255},{"name":"align.wast","passed":108,"failed":48},{"name":"binary-leb128.wast","passed":91,"failed":0},{"name":"binary.wast","passed":112,"failed":0},{"name":"block.wast","passed":193,"failed":30},{"name":"br.wast","passed":84,"failed":13},{"name":"br_if.wast","passed":90,"failed":28},{"name":"br_table.wast","passed":25,"failed":149},{"name":"call.wast","passed":29,"failed":62},{"name":"call_indirect.wast","passed":36,"failed":134},{"name":"comments.wast","passed":7,"failed":1},{"name":"const.wast","passed":778,"failed":0},{"name":"conversions.wast","passed":371,"failed":248},{"name":"custom.wast","passed":11,"failed":0},{"name":"data.wast","passed":47,"failed":14},{"name":"elem.wast","passed":55,"failed":44},{"name":"endianness.wast","passed":1,"failed":68},{"name":"exports.wast","passed":92,"failed":4},{"name":"f32.wast","passed":2514,"failed":0},{"name":"f32_bitwise.wast","passed":364,"failed":0},{"name":"f32_cmp.wast","passed":2407,"failed":0},{"name":"f64.wast","passed":2514,"failed":0},{"name":"f64_bitwise.wast","passed":364,"failed":0},{"name":"f64_cmp.wast","passed":2407,"failed":0},{"name":"fac.wast","passed":2,"failed":6},{"name":"float_exprs.wast","passed":761,"failed":139},{"name":"float_literals.wast","passed":163,"failed":0},{"name":"float_memory.wast","passed":6,"failed":84},{"name":"float_misc.wast","passed":437,"failed":4},{"name":"forward.wast","passed":1,"failed":4},{"name":"func.wast","passed":124,"failed":48},{"name":"func_ptrs.wast","passed":10,"failed":26},{"name":"global.wast","passed":52,"failed":58},{"name":"i32.wast","passed":460,"failed":0},{"name":"i64.wast","passed":416,"failed":0},{"name":"if.wast","passed":120,"failed":121},{"name":"imports.wast","passed":74,"failed":109},{"name":"inline-module.wast","passed":1,"failed":0},{"name":"int_exprs.wast","passed":108,"failed":0},{"name":"int_literals.wast","passed":51,"failed":0},{"name":"labels.wast","passed":14,"failed":15},{"name":"left-to-right.wast","passed":1,"failed":95},{"name":"linking.wast","passed":22,"failed":110},{"name":"load.wast","passed":60,"failed":37},{"name":"local_get.wast","passed":32,"failed":4},{"name":"local_set.wast","passed":50,"failed":3},{"name":"local_tee.wast","passed":68,"failed":29},{"name":"loop.wast","passed":93,"failed":27},{"name":"memory.wast","passed":34,"failed":45},{"name":"memory_grow.wast","passed":12,"failed":84},{"name":"memory_redundancy.wast","passed":1,"failed":7},{"name":"memory_size.wast","passed":6,"failed":36},{"name":"memory_trap.wast","passed":2,"failed":180},{"name":"names.wast","passed":485,"failed":1},{"name":"nop.wast","passed":46,"failed":42},{"name":"return.wast","passed":73,"failed":11},{"name":"select.wast","passed":86,"failed":62},{"name":"skip-stack-guard-page.wast","passed":1,"failed":10},{"name":"stack.wast","passed":2,"failed":5},{"name":"start.wast","passed":9,"failed":11},{"name":"store.wast","passed":59,"failed":9},{"name":"switch.wast","passed":2,"failed":26},{"name":"token.wast","passed":58,"failed":0},{"name":"traps.wast","passed":22,"failed":14},{"name":"type.wast","passed":3,"failed":0},{"name":"unreachable.wast","passed":50,"failed":14},{"name":"unreached-invalid.wast","passed":118,"failed":0},{"name":"unwind.wast","passed":35,"failed":15},{"name":"utf8-custom-section-id.wast","passed":176,"failed":0},{"name":"utf8-import-field.wast","passed":176,"failed":0},{"name":"utf8-import-module.wast","passed":176,"failed":0},{"name":"utf8-invalid-encoding.wast","passed":176,"failed":0}]
+0.2.0-alpha.0,17639,2580,[{"name":"address.wast","passed":5,"failed":255},{"name":"align.wast","passed":108,"failed":48},{"name":"binary-leb128.wast","passed":91,"failed":0},{"name":"binary.wast","passed":112,"failed":0},{"name":"block.wast","passed":193,"failed":30},{"name":"br.wast","passed":84,"failed":13},{"name":"br_if.wast","passed":90,"failed":28},{"name":"br_table.wast","passed":25,"failed":149},{"name":"call.wast","passed":29,"failed":62},{"name":"call_indirect.wast","passed":36,"failed":134},{"name":"comments.wast","passed":7,"failed":1},{"name":"const.wast","passed":778,"failed":0},{"name":"conversions.wast","passed":371,"failed":248},{"name":"custom.wast","passed":11,"failed":0},{"name":"data.wast","passed":47,"failed":14},{"name":"elem.wast","passed":55,"failed":44},{"name":"endianness.wast","passed":1,"failed":68},{"name":"exports.wast","passed":92,"failed":2},{"name":"f32.wast","passed":2514,"failed":0},{"name":"f32_bitwise.wast","passed":364,"failed":0},{"name":"f32_cmp.wast","passed":2407,"failed":0},{"name":"f64.wast","passed":2514,"failed":0},{"name":"f64_bitwise.wast","passed":364,"failed":0},{"name":"f64_cmp.wast","passed":2407,"failed":0},{"name":"fac.wast","passed":2,"failed":6},{"name":"float_exprs.wast","passed":761,"failed":139},{"name":"float_literals.wast","passed":163,"failed":0},{"name":"float_memory.wast","passed":6,"failed":84},{"name":"float_misc.wast","passed":437,"failed":4},{"name":"forward.wast","passed":1,"failed":4},{"name":"func.wast","passed":124,"failed":48},{"name":"func_ptrs.wast","passed":10,"failed":26},{"name":"global.wast","passed":52,"failed":58},{"name":"i32.wast","passed":460,"failed":0},{"name":"i64.wast","passed":416,"failed":0},{"name":"if.wast","passed":120,"failed":121},{"name":"imports.wast","passed":74,"failed":109},{"name":"inline-module.wast","passed":1,"failed":0},{"name":"int_exprs.wast","passed":108,"failed":0},{"name":"int_literals.wast","passed":51,"failed":0},{"name":"labels.wast","passed":14,"failed":15},{"name":"left-to-right.wast","passed":1,"failed":95},{"name":"linking.wast","passed":22,"failed":103},{"name":"load.wast","passed":60,"failed":37},{"name":"local_get.wast","passed":32,"failed":4},{"name":"local_set.wast","passed":50,"failed":3},{"name":"local_tee.wast","passed":68,"failed":29},{"name":"loop.wast","passed":93,"failed":27},{"name":"memory.wast","passed":34,"failed":45},{"name":"memory_grow.wast","passed":12,"failed":84},{"name":"memory_redundancy.wast","passed":1,"failed":7},{"name":"memory_size.wast","passed":6,"failed":36},{"name":"memory_trap.wast","passed":2,"failed":180},{"name":"names.wast","passed":485,"failed":1},{"name":"nop.wast","passed":46,"failed":42},{"name":"return.wast","passed":73,"failed":11},{"name":"select.wast","passed":86,"failed":62},{"name":"skip-stack-guard-page.wast","passed":1,"failed":10},{"name":"stack.wast","passed":2,"failed":5},{"name":"start.wast","passed":9,"failed":11},{"name":"store.wast","passed":59,"failed":9},{"name":"switch.wast","passed":2,"failed":26},{"name":"token.wast","passed":58,"failed":0},{"name":"traps.wast","passed":22,"failed":14},{"name":"type.wast","passed":3,"failed":0},{"name":"unreachable.wast","passed":50,"failed":14},{"name":"unreached-invalid.wast","passed":118,"failed":0},{"name":"unwind.wast","passed":35,"failed":15},{"name":"utf8-custom-section-id.wast","passed":176,"failed":0},{"name":"utf8-import-field.wast","passed":176,"failed":0},{"name":"utf8-import-module.wast","passed":176,"failed":0},{"name":"utf8-invalid-encoding.wast","passed":176,"failed":0}]
diff --git a/crates/tinywasm/tests/generated/progress-mvp.svg b/crates/tinywasm/tests/generated/progress-mvp.svg
index 8d954a1..48bd29f 100644
--- a/crates/tinywasm/tests/generated/progress-mvp.svg
+++ b/crates/tinywasm/tests/generated/progress-mvp.svg
@@ -56,9 +56,9 @@ v0.1.0 (17630)
 v0.2.0-alpha.0 (17639)
 </text>
 <polyline fill="none" opacity="1" stroke="#000000" stroke-width="1" points="898,345 898,350 "/>
-<rect x="266" y="212" width="172" height="132" opacity="0.5" fill="#0000FF" stroke="none"/>
-<rect x="85" y="212" width="171" height="132" opacity="0.5" fill="#0000FF" stroke="none"/>
 <rect x="448" y="185" width="172" height="159" opacity="0.5" fill="#0000FF" stroke="none"/>
 <rect x="630" y="92" width="172" height="252" opacity="0.5" fill="#0000FF" stroke="none"/>
+<rect x="85" y="212" width="171" height="132" opacity="0.5" fill="#0000FF" stroke="none"/>
+<rect x="266" y="212" width="172" height="132" opacity="0.5" fill="#0000FF" stroke="none"/>
 <rect x="812" y="92" width="172" height="252" opacity="0.5" fill="#0000FF" stroke="none"/>
 </svg>
diff --git a/crates/tinywasm/tests/test-mvp.rs b/crates/tinywasm/tests/test-mvp.rs
index cc04a3c..0e5b02f 100644
--- a/crates/tinywasm/tests/test-mvp.rs
+++ b/crates/tinywasm/tests/test-mvp.rs
@@ -1,5 +1,6 @@
 mod testsuite;
 use eyre::{eyre, Result};
+use owo_colors::OwoColorize;
 use testsuite::TestSuite;
 
 fn main() -> Result<()> {
@@ -13,8 +14,12 @@ fn test_mvp() -> Result<()> {
     test_suite.save_csv("./tests/generated/mvp.csv", env!("CARGO_PKG_VERSION"))?;
 
     if test_suite.failed() {
-        eprintln!("\n\nfailed one or more tests:\n{:#?}", test_suite);
-        Err(eyre!("failed one or more tests"))
+        println!();
+        Err(eyre!(format!(
+            "{}:\n{:#?}",
+            "failed one or more tests".red().bold(),
+            test_suite,
+        )))
     } else {
         println!("\n\npassed all tests:\n{:#?}", test_suite);
         Ok(())
diff --git a/crates/tinywasm/tests/test-wast.rs b/crates/tinywasm/tests/test-wast.rs
index 68372a0..1efa85d 100644
--- a/crates/tinywasm/tests/test-wast.rs
+++ b/crates/tinywasm/tests/test-wast.rs
@@ -1,6 +1,7 @@
 use std::path::PathBuf;
 
-use eyre::{bail, Result};
+use eyre::{bail, eyre, Result};
+use owo_colors::OwoColorize;
 use testsuite::TestSuite;
 
 mod testsuite;
@@ -40,9 +41,10 @@ fn test_wast(wast_file: &str) -> Result<()> {
     test_suite.run_paths(&[wast_file])?;
 
     if test_suite.failed() {
-        eprintln!("\n\nfailed one or more tests:\n{:#?}", test_suite);
+        println!();
         test_suite.print_errors();
-        bail!("failed one or more tests")
+        println!();
+        Err(eyre!(format!("{}", "failed one or more tests".red().bold())))
     } else {
         println!("\n\npassed all tests:\n{:#?}", test_suite);
         Ok(())
diff --git a/crates/tinywasm/tests/testsuite/mod.rs b/crates/tinywasm/tests/testsuite/mod.rs
index fd3e39f..cfbe882 100644
--- a/crates/tinywasm/tests/testsuite/mod.rs
+++ b/crates/tinywasm/tests/testsuite/mod.rs
@@ -1,6 +1,7 @@
 #![allow(dead_code)] // rust analyzer doesn't recognize that code is used by tests without harness
 
 use eyre::Result;
+use owo_colors::OwoColorize;
 use std::io::{BufRead, Seek, SeekFrom};
 use std::{
     collections::BTreeMap,
@@ -20,6 +21,10 @@ pub struct TestGroupResult {
     pub failed: usize,
 }
 
+fn format_linecol(linecol: (usize, usize)) -> String {
+    format!("{}:{}", linecol.0 + 1, linecol.1 + 1)
+}
+
 pub struct TestSuite(BTreeMap<String, TestGroup>);
 
 impl TestSuite {
@@ -31,7 +36,15 @@ impl TestSuite {
         for (group_name, group) in &self.0 {
             for (test_name, test) in &group.tests {
                 if let Err(e) = &test.result {
-                    eprintln!("{}: {} failed: {:?}", group_name, test_name, e);
+                    eprintln!(
+                        "{} {} failed: {:?}",
+                        link(
+                            format!("{}:{}", group_name.red().underline(), test.linecol.0 + 1).as_str(),
+                            format!("{}:{}", group.file, test.linecol.0 + 1).as_str()
+                        ),
+                        test_name.bold(),
+                        e.to_string().bright_red()
+                    );
                 }
             }
         }
@@ -45,8 +58,8 @@ impl TestSuite {
         self.0.values().any(|group| group.stats().1 > 0)
     }
 
-    fn test_group(&mut self, name: &str) -> &mut TestGroup {
-        self.0.entry(name.to_string()).or_insert_with(TestGroup::new)
+    fn test_group(&mut self, name: &str, file: &str) -> &mut TestGroup {
+        self.0.entry(name.to_string()).or_insert_with(|| TestGroup::new(file))
     }
 
     // create or add to a test result file
@@ -93,9 +106,12 @@ impl TestSuite {
     }
 }
 
+fn link(name: &str, file: &str) -> String {
+    format!("\x1b]8;;file://{}\x1b\\{}\x1b]8;;\x1b\\", file, name)
+}
+
 impl Debug for TestSuite {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-        use owo_colors::OwoColorize;
         let mut total_passed = 0;
         let mut total_failed = 0;
 
@@ -104,7 +120,7 @@ impl Debug for TestSuite {
             total_passed += group_passed;
             total_failed += group_failed;
 
-            writeln!(f, "{}", group_name.bold().underline())?;
+            writeln!(f, "{}", link(group_name, &group.file).bold().underline())?;
             writeln!(f, "  Tests Passed: {}", group_passed.to_string().green())?;
             writeln!(f, "  Tests Failed: {}", group_failed.to_string().red())?;
 
@@ -133,14 +149,20 @@ impl Debug for TestSuite {
 
 struct TestGroup {
     tests: BTreeMap<String, TestCase>,
+    file: String,
 }
 
 impl TestGroup {
-    fn new() -> Self {
-        Self { tests: BTreeMap::new() }
+    fn new(file: &str) -> Self {
+        Self {
+            tests: BTreeMap::new(),
+            file: file.to_string(),
+        }
     }
 
     fn stats(&self) -> (usize, usize) {
+        log::error!("stats: {:?}", self.tests);
+
         let mut passed_count = 0;
         let mut failed_count = 0;
 
@@ -154,12 +176,13 @@ impl TestGroup {
         (passed_count, failed_count)
     }
 
-    fn add_result(&mut self, name: &str, span: wast::token::Span, result: Result<()>) {
-        self.tests.insert(name.to_string(), TestCase { result, _span: span });
+    fn add_result(&mut self, name: &str, linecol: (usize, usize), result: Result<()>) {
+        self.tests.insert(name.to_string(), TestCase { result, linecol });
     }
 }
 
+#[derive(Debug)]
 struct TestCase {
     result: Result<()>,
-    _span: wast::token::Span,
+    linecol: (usize, usize),
 }
diff --git a/crates/tinywasm/tests/testsuite/run.rs b/crates/tinywasm/tests/testsuite/run.rs
index fc3d7bc..1473b17 100644
--- a/crates/tinywasm/tests/testsuite/run.rs
+++ b/crates/tinywasm/tests/testsuite/run.rs
@@ -12,7 +12,6 @@ impl TestSuite {
         tests.iter().for_each(|group| {
             let group_wast = std::fs::read(group).expect("failed to read test wast");
             let group_wast = Cow::Owned(group_wast);
-            debug!("running group: {}", group);
             self.run_group(group, group_wast).expect("failed to run group");
         });
 
@@ -29,7 +28,8 @@ impl TestSuite {
     }
 
     pub fn run_group(&mut self, group_name: &str, group_wast: Cow<'_, [u8]>) -> Result<()> {
-        let test_group = self.test_group(group_name);
+        let file_name = group_name.split('/').last().unwrap_or(group_name);
+        let test_group = self.test_group(file_name, group_name);
         let wast = std::str::from_utf8(&group_wast).expect("failed to convert wast to utf8");
 
         let mut lexer = Lexer::new(wast);
@@ -46,8 +46,6 @@ impl TestSuite {
             use wast::WastDirective::*;
             let name = format!("{}-{}", group_name, i);
 
-            debug!("directive: {:?}", directive);
-
             match directive {
                 Wat(mut module) => {
                     debug!("got wat module");
@@ -65,7 +63,7 @@ impl TestSuite {
                         debug!("failed to parse module: {:?}", err)
                     }
 
-                    test_group.add_result(&format!("{}-parse", name), span, result.map(|_| ()));
+                    test_group.add_result(&format!("{}-parse", name), span.linecol_in(wast), result.map(|_| ()));
                 }
 
                 AssertMalformed {
@@ -74,7 +72,7 @@ impl TestSuite {
                     message: _,
                 } => {
                     let Ok(module) = module.encode() else {
-                        test_group.add_result(&format!("{}-malformed", name), span, Ok(()));
+                        test_group.add_result(&format!("{}-malformed", name), span.linecol_in(wast), Ok(()));
                         continue;
                     };
 
@@ -84,7 +82,7 @@ impl TestSuite {
 
                     test_group.add_result(
                         &format!("{}-malformed", name),
-                        span,
+                        span.linecol_in(wast),
                         match res {
                             Ok(_) => Err(eyre!("expected module to be malformed")),
                             Err(_) => Ok(()),
@@ -103,7 +101,7 @@ impl TestSuite {
 
                     test_group.add_result(
                         &format!("{}-invalid", name),
-                        span,
+                        span.linecol_in(wast),
                         match res {
                             Ok(_) => Err(eyre!("expected module to be invalid")),
                             Err(_) => Ok(()),
@@ -134,41 +132,46 @@ impl TestSuite {
                     match res {
                         Err(err) => test_group.add_result(
                             &format!("{}-trap", name),
-                            span,
-                            Err(eyre!("test panicked: {:?}, span: {:?}", err, span.linecol_in(&wast))),
+                            span.linecol_in(wast),
+                            Err(eyre!("test panicked: {:?}", err)),
                         ),
                         Ok(Err(tinywasm::Error::Trap(_))) => {
-                            test_group.add_result(&format!("{}-trap", name), span, Ok(()))
+                            test_group.add_result(&format!("{}-trap", name), span.linecol_in(wast), Ok(()))
                         }
                         Ok(Err(err)) => test_group.add_result(
                             &format!("{}-trap", name),
-                            span,
-                            Err(eyre!(
-                                "expected trap, got error: {:?}, span: {:?}",
-                                err,
-                                span.linecol_in(&wast)
-                            )),
+                            span.linecol_in(wast),
+                            Err(eyre!("expected trap, got error: {:?}", err,)),
                         ),
                         Ok(Ok(())) => test_group.add_result(
                             &format!("{}-trap", name),
-                            span,
-                            Err(eyre!("expected trap, got ok, span: {:?}", span.linecol_in(&wast))),
+                            span.linecol_in(wast),
+                            Err(eyre!("expected trap, got ok")),
                         ),
                     }
                 }
 
                 AssertReturn { span, exec, results } => {
                     info!("AssertReturn: {:?}", exec);
-                    let res: Result<Result<()>, _> = catch_unwind_silent(|| {
-                        let invoke = match exec {
-                            wast::WastExecute::Wat(_) => {
-                                error!("wat not supported");
-                                return Err(eyre!("wat not supported"));
-                            }
-                            wast::WastExecute::Get { module: _, global: _ } => return Err(eyre!("get not supported")),
-                            wast::WastExecute::Invoke(invoke) => invoke,
-                        };
 
+                    let invoke = match match exec {
+                        wast::WastExecute::Wat(_) => Err(eyre!("wat not supported")),
+                        wast::WastExecute::Get { module: _, global: _ } => Err(eyre!("get not supported")),
+                        wast::WastExecute::Invoke(invoke) => Ok(invoke),
+                    } {
+                        Ok(invoke) => invoke,
+                        Err(err) => {
+                            test_group.add_result(
+                                "AssertReturn(unknown)",
+                                span.linecol_in(wast),
+                                Err(eyre!("unsupported directive: {:?}", err)),
+                            );
+                            continue;
+                        }
+                    };
+                    let invoke_name = invoke.name;
+
+                    let res: Result<Result<()>, _> = catch_unwind_silent(|| {
                         debug!("invoke: {:?}", invoke);
                         let args = invoke
                             .args
@@ -212,15 +215,9 @@ impl TestSuite {
                             .zip(expected)
                             .enumerate()
                             .try_for_each(|(i, (outcome, exp))| {
-                                (outcome.eq_loose(&exp)).then_some(()).ok_or_else(|| {
-                                    eyre!(
-                                        "span: {:?}: result {} did not match: {:?} != {:?}",
-                                        span.linecol_in(&wast),
-                                        i,
-                                        outcome,
-                                        exp
-                                    )
-                                })
+                                (outcome.eq_loose(&exp))
+                                    .then_some(())
+                                    .ok_or_else(|| eyre!(" result {} did not match: {:?} != {:?}", i, outcome, exp))
                             })
                     });
 
@@ -228,9 +225,17 @@ impl TestSuite {
                         .map_err(|e| eyre!("test panicked: {:?}", e.downcast_ref::<&str>()))
                         .and_then(|r| r);
 
-                    test_group.add_result(&format!("{}-return", name), span, res);
+                    test_group.add_result(
+                        &format!("AssertReturn({}-{})", invoke_name, i),
+                        span.linecol_in(wast),
+                        res,
+                    );
                 }
-                _ => test_group.add_result(&format!("{}-unknown", name), span, Err(eyre!("unsupported directive"))),
+                _ => test_group.add_result(
+                    &format!("Unknown({})", i),
+                    span.linecol_in(wast),
+                    Err(eyre!("unsupported directive")),
+                ),
             }
         }