jstest: prep for multiple tests

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Makefile b/Makefile
index 1b9b02aab074a69706764903ae5dca620513ff03..331debddb642b84418f4016a30c503c74a67f8cc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -253,10 +253,12 @@ docs/html/examples/%.toml: specs/%.toml
 
 #---------- jstest ----------
 
+JSTESTS= wasmtest
+
 .PHONY: jstest
-jstest: stamp/jstest
+jstest jstests: $(foreach t,$(JSTESTS),stamp/$t.jstest)
 
-stamp/jstest: jstest/run jstest/wasmtest.nodejs templates/script.js \
+stamp/%.jstest: jstest/run1 jstest/%.nodejs templates/script.js \
                stamp/wasm-bindgen-jstest
        $(NAILING_CARGO_JUST_RUN) $(abspath $(filter-out stamp/%,$^))
        $(stamp)

diff --git a/jstest/run b/jstest/run1
similarity index 94%
rename from jstest/run
rename to jstest/run1
index ad48de725f9aa3cd31a89e63a88e952da4508c1f..da24dabfc93b57330a96375bf6c40b200213a83d 100755 (executable)
--- a/jstest/run
+++ b/jstest/run1
@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e
-self=jstest/run
+self=jstest/run1
 src="${0%/$self}"
 fail () { echo >&2 "$self: error: $*"; exit 1; }
 [ "x$src/$self" = "x$0" ] || fail "mismatch $src/$self $0"

diff --git a/jstest/wasmtest.nodejs b/jstest/wasmtest.nodejs
index ea39d71b32ec0e661701a6c1de2c77bd4f0016c8..2a150fc3b26f39632ed42ff469c02ad0352e8e8a 100644 (file)
--- a/jstest/wasmtest.nodejs
+++ b/jstest/wasmtest.nodejs
@@ -1,7 +1,8 @@
 // -*- JavaScript -*-
-
-// currently expected output
+//
+// @@expect
 // g000000000
+// @@end
 
 const fs = require('fs');
 let wasm_bindgen = require('otter_wasm.js');