From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 2 Jan 2021 02:50:00 +0000 (+0000)
Subject: tests wired up to makefile
X-Git-Tag: otter-0.2.0~55
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d6aa0cb3c5dcbe247a9c3fc5df7d5e19d30e6d6f;p=otter.git

tests wired up to makefile

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

diff --git a/Makefile b/Makefile
index b5dbd653..f364ac65 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,7 @@ WASM := wasm32-unknown-unknown
 
 #---------- toplevel aggregate targets ----------
 
-check: stamp/cargo.check
+check: stamp/cargo.check wdt
 	@echo 'All tests passed.'
 
 doc: cargo-doc
@@ -151,6 +151,10 @@ stamp/cargo.check: $(call rsrcs,.)
 	$(CARGO) test --workspace
 	$(stamp)
 
+stamp/cargo-wdt.debug: $(call rsrcs,.)
+	$(CARGO) build $(call cr,$*) -p otter-webdriver-tests
+	$(stamp)
+
 stamp/cargo.doc: $(call rsrcs,.)
 	$(CARGO) doc --workspace
 	$(stamp)
@@ -253,6 +257,17 @@ $(addprefix templates/,$(TXTFILES)): templates/%: %.txt
 
 libraries: $(LIBRARY_FILES)
 
+#---------- webdriver tests (wdt) ----------
+
+WDT_TESTS := $(basename $(notdir $(wildcard wdriver/wdt-*.rs)))
+
+wdt:	$(foreach f, $(WDT_TESTS), stamp/$f.check)
+
+stamp/wdt-%.check:	wdriver/run1 stamp/cargo.debug stamp/cargo-wdt.debug \
+			$(FILEASSETS) templates/script.js $(LIBRARY_FILES)
+	$(NAILING_CARGO_JUST_RUN) $(abspath $<) $(basename $(notdir $@))
+	$(stamp)
+
 #---------- deployment ----------
 
 DEPLOY_USER=ian@login.chiark.greenend.org.uk
diff --git a/wdriver/run1 b/wdriver/run1
new file mode 100755
index 00000000..53555ceb
--- /dev/null
+++ b/wdriver/run1
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -e
+
+tname="$1";
+mkdir -p tmp
+
+target/debug/"$tname" 2>&1 | ts -s %.s >tmp/"$tname".log
+case "${PIPESTATUS[*]}" in
+"0 0")	exit 0;
+esac
+
+grep -v 'DEBUG [otter_webdriver_tests]' <tmp/"$tname".log \
+| tail -20
+
+exit 1