From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 8 Jul 2021 12:09:26 +0000 (+0100)
Subject: Makefile: jstest can run from Makefile
X-Git-Tag: otter-0.7.2~243
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=75edfad2d1f56c534175a8fd23a4d7420cdbef09;p=otter.git

Makefile: jstest can run from Makefile

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

diff --git a/Makefile b/Makefile
index 63ea8ddf..17c9ba10 100644
--- a/Makefile
+++ b/Makefile
@@ -251,6 +251,12 @@ docs/html/examples/%.toml: specs/%.toml
 	mkdir -p docs/html/examples
 	rm -f $@ && ln $< $@
 
+#---------- jstest ----------
+
+stamp/jstest: jstest/run jstest/wasmtest.nodejs stamp/wasm-bindgen-jstest
+	$(NAILING_CARGO_JUST_RUN) $(abspath $(filter-out stamp/%,$^))
+	$(stamp)
+
 #---------- wasm ----------
 
 $(addprefix $(WASM_PACKED)/,$(WASM_ASSETS) $(WASM_OUTPUTS)): stamp/wasm-bindgen
@@ -261,6 +267,13 @@ stamp/wasm-bindgen: stamp/cargo.wasm-bindgen stamp/cargo.wasm-release
 		target/$(WASM)/release/otter_wasm.wasm
 	$(stamp)
 
+stamp/wasm-bindgen-jstest: stamp/cargo.wasm-bindgen stamp/cargo.wasm-release
+	$(NAILING_CARGO_JUST_RUN) $(abspath $(WASM_BINDGEN)) \
+		$(WASM_BINDGEN_OPTIONS) --nodejs \
+		--out-dir target/jstest \
+		target/$(WASM)/release/otter_wasm.wasm
+	$(stamp)
+
 #---------- bundle-sources ----------
 
 BUNDLED_SOURCES_DIRS += otter
diff --git a/jstest/run b/jstest/run
new file mode 100755
index 00000000..109466a3
--- /dev/null
+++ b/jstest/run
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+self=jstest/run
+src="${0%/$self}"
+fail () { echo >&2 "$self: error: $*"; exit 1; }
+[ "x$src/$self" = "x$0" ] || fail "mismatch $src/$self $0"
+
+cd target/jstest
+export NODE_PATH=.
+ln -sf "$@" .
+
+nodejs wasmtest.nodejs