X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test-common.make.in;h=d862480cae7df6d4883078db14f27613ccaaa97f;hb=7ff66e19d76edc0e84e4349c41a5b34d062b490a;hp=fb823352c7fc0692572f08a2423323c98c3d4456;hpb=001316f26a63d531d9b29d543f31679b41c8a203;p=secnet.git

diff --git a/test-common.make.in b/test-common.make.in
index fb82335..d862480 100644
--- a/test-common.make.in
+++ b/test-common.make.in
@@ -5,18 +5,25 @@ TESTSCRIPTS ?= $(shell echo $(srcdir)/t-*[0-9a-z])
 TESTNAMES := $(patsubst t-%,%,$(notdir $(TESTSCRIPTS)))
 
 DEPS += $(topdir)/test-common.tcl
+DEPS += $(topdir)/common.make
+DEPS += $(topdir)/test-common.make
+DEPS += Makefile
 
 TARGETS += check
 
+export PYTHONBYTECODEBASE=/dev/null
+
 all: $(TARGETS)
 
 check-real: $(foreach t,$(TESTNAMES),d-$t/ok)
 
 d-%/ok: $(srcdir)/t-% $(DEPS)
 	@rm -rf d-$*; mkdir d-$*
-	export STEST_BUILDDIR=$(topbuilddir); \
-	cd $(topdir) && stest/t-$* >$(topbuilddir)/stest/d-$*/log 2>&1
-	@printf "$* "
+	@export SECNET_TEST_BUILDDIR=$(topbuilddir); \
+	 cd $(topdir) && \
+	 $(TESTDIR)/t-$* >$(topbuilddir)/$(TESTDIR)/d-$*/log 2>&1 \
+	 || { cat $(topbuilddir)/$(TESTDIR)/d-$*/log >&2; false; }
+	@printf "$(TESTDIR)/$* "
 	@touch $@
 
 clean: