X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test-common.sd.mk;h=2bc48eb1b83d3613e3f57e4b1fe2f57dde2c343a;hb=564022994befb8f71b89ae015751b22c34ae3ee8;hp=bf9c6cf26a25a9ec4276209bfc80dc2b8c574dcc;hpb=3a2c5e1f10dc6b3cc86f74c287d8c14be14d7e80;p=secnet.git

diff --git a/test-common.sd.mk b/test-common.sd.mk
index bf9c6cf..2bc48eb 100644
--- a/test-common.sd.mk
+++ b/test-common.sd.mk
@@ -1,16 +1,22 @@
 
 include common.make
 
-&TESTSCRIPTS ?= $(shell echo &^/t-*[0-9a-z])
+&TESTSCRIPTS ?= $(wildcard &^/t-[a-z]*[0-9a-z])
+ifneq ($(OLD_SECNET_DIR),)
+&TESTSCRIPTS += $(wildcard &^/t-C*[0-9a-z])
+endif
+
 &TESTNAMES := $(patsubst t-%,%,$(notdir $(&TESTSCRIPTS)))
 
 &DEPS += $(src)/test-common.tcl
 &DEPS += common.make
 &DEPS += $(src)/test-common.sd.mk
-&DEPS += &/Subdir.mk
+&DEPS += &/Dir.mk
 
 &check-real: $(foreach t,$(&TESTNAMES),&d-$t/ok)
 
+RECHECK_RM += &d-*
+
 CHECK_SILENT ?= @
 
 &d-%/ok: &^/t-% $(&DEPS)
@@ -18,8 +24,8 @@ CHECK_SILENT ?= @
 	$(CHECK_SILENT) export SECNET_TEST_BUILDDIR=$(topbuilddir); \
 	 export PYTHONBYTECODEBASE=/dev/null; \
 	 cd $(src) && \
-	 &/t-$* >$(topbuilddir)/&/d-$*/log 2>\&1 \
-	 || { cat $(topbuilddir)/&/d-$*/log >\&2; false; }
+	 &/t-$* >$(topbuilddir)/&/d-$*/log 2>&\&1 \
+	 || { cat $(topbuilddir)/&/d-$*/log >&\&2; false; }
 	$(CHECK_SILENT) printf "&/$* "
 	$(CHECK_SILENT) touch $@