X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=test-common.sd.mk;h=0b7f4dffe47d4518e9ef6cc894c89c67f0e34104;hb=49b56eafcd147185c28848a7c04e31a32c49a82e;hp=81b3722fdc71852ad21d46869b3fe3b3524ee7e0;hpb=2f917f0989d0b868265d2e906a3e087b6606a29e;p=secnet.git

diff --git a/test-common.sd.mk b/test-common.sd.mk
index 81b3722..0b7f4df 100644
--- a/test-common.sd.mk
+++ b/test-common.sd.mk
@@ -1,13 +1,17 @@
 
 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)
 
@@ -18,14 +22,13 @@ 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 $@
 
+&CLEAN += & *.so
+
 &clean::
-	$(RM) -f & *.o *.so
 	$(RM) -rf & tmp
 	$(RM) -rf & d-*
-
-&:include subdirmk/clean.sd.mk