X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test-common.sd.mk;h=0b7f4dffe47d4518e9ef6cc894c89c67f0e34104;hb=9eba4abfe44617aa78f625d900fe6bc2c58bb4cb;hp=e8bfcd3a69cd3f9b5f60f3d06fc2fe9f596163ea;hpb=cc7d00776568949e72c8ce5fd894a8bc05998fcb;p=secnet.git

diff --git a/test-common.sd.mk b/test-common.sd.mk
index e8bfcd3..0b7f4df 100644
--- a/test-common.sd.mk
+++ b/test-common.sd.mk
@@ -1,29 +1,34 @@
 
 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 += $(src)/common.make
+&DEPS += common.make
 &DEPS += $(src)/test-common.sd.mk
-&DEPS += &/Subdir.mk
-
-&TARGETS += &check
+&DEPS += &/Dir.mk
 
 &check-real: $(foreach t,$(&TESTNAMES),&d-$t/ok)
 
+CHECK_SILENT ?= @
+
 &d-%/ok: &^/t-% $(&DEPS)
-	@rm -rf &d-$*; mkdir &d-$*
-	@export SECNET_TEST_BUILDDIR=$(topbuilddir); \
+	$(CHECK_SILENT) rm -rf &d-$*; mkdir &d-$*
+	$(CHECK_SILENT) export SECNET_TEST_BUILDDIR=$(topbuilddir); \
 	 export PYTHONBYTECODEBASE=/dev/null; \
 	 cd $(src) && \
-	 &^/t-$* >&d-$*/log 2>\&1 \
-	 || { cat &d-$*/log >\&2; false; }
-	@printf "&/$* "
-	@touch $@
+	 &/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-*