From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 8 Jul 2021 12:25:43 +0000 (+0100)
Subject: jstest: prep for multiple tests
X-Git-Tag: otter-0.7.2~238
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=65a6d329373a7e32052993f4835fef3fadd6c17b;p=otter.git

jstest: prep for multiple tests

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

diff --git a/Makefile b/Makefile
index 1b9b02aa..331debdd 100644
--- 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 ad48de72..da24dabf 100755
--- 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 ea39d71b..2a150fc3 100644
--- 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');