tests: improve test glue code

Signed-off-by: Henry <[email protected]>

Author: explodingcamera

Cargo.lock

@@ -20,7 +20,7 @@ tinywasm-types={version="0.0.6-alpha.0", path="../types", default-features=false
 [dev-dependencies]
 wasm-testsuite={path="../wasm-testsuite"}
 wast={version="69.0"}
-owo-colors={version="3.5"}
+owo-colors={version="4.0"}
 eyre={version="0.6"}
 serde_json={version="1.0"}
 serde={version="1.0", features=["derive"]}

crates/tinywasm/Cargo.toml

@@ -9,7 +9,7 @@ fn main() -> Result<()> {
 fn test_mvp() -> Result<()> {
     let mut test_suite = TestSuite::new();
 
-    test_suite.run(wasm_testsuite::MVP_TESTS)?;
+    test_suite.run_spec_group(wasm_testsuite::MVP_TESTS)?;
     test_suite.save_csv("./tests/generated/mvp.csv", env!("CARGO_PKG_VERSION"))?;
 
     if test_suite.failed() {

crates/tinywasm/tests/test-mvp.rs

@@ -1,3 +1,5 @@
+use std::path::PathBuf;
+
 use eyre::{bail, Result};
 use testsuite::TestSuite;
 
@@ -9,8 +11,20 @@ fn main() -> Result<()> {
         bail!("usage: cargo test-wast <wast-file>")
     }
 
-    let wast_file = &args[1];
-    test_wast(wast_file)?;
+    // cwd for relative paths, absolute paths are kept as-is
+    let cwd = std::env::current_dir()?;
+
+    // if current dir is crates/tinywasm, then we want to go up 2 levels
+    let mut wast_file = if cwd.ends_with("crates/tinywasm") {
+        PathBuf::from("../../")
+    } else {
+        PathBuf::from("./")
+    };
+
+    wast_file.push(&args[1]);
+    let wast_file = cwd.join(wast_file);
+
+    test_wast(wast_file.to_str().expect("wast_file is not a valid path"))?;
     Ok(())
 }
 
@@ -19,7 +33,8 @@ fn test_wast(wast_file: &str) -> Result<()> {
     println!("args: {:?}", args);
 
     let mut test_suite = TestSuite::new();
-    test_suite.run(&[wast_file])?;
+    println!("running wast file: {}", wast_file);
+    test_suite.run_paths(&[wast_file])?;
 
     if test_suite.failed() {
         eprintln!("\n\nfailed one or more tests:\n{:#?}", test_suite);

crates/tinywasm/tests/test-wast.rs

@@ -1,3 +1,5 @@
+#![allow(dead_code)] // rust analyzer doesn't recognize that code is used by tests without harness
+
 use eyre::Result;
 use std::io::{BufRead, Seek, SeekFrom};
 use std::{