X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test-common.sd.mk;h=904536d040f1a3c2d8bdd9607722b3ca35b6c6e0;hb=31c89500dd7755b13880409d4edc441ff06ffd37;hp=bf9c6cf26a25a9ec4276209bfc80dc2b8c574dcc;hpb=24eb6b672f1095d5b362b6615f22c17f1136274a;p=secnet.git

diff --git a/test-common.sd.mk b/test-common.sd.mk
index bf9c6cf..904536d 100644
--- a/test-common.sd.mk
+++ b/test-common.sd.mk
@@ -1,13 +1,13 @@
 
 include common.make
 
-&TESTSCRIPTS ?= $(shell echo &^/t-*[0-9a-z])
+&TESTSCRIPTS ?= $(wildcard &^/t-*[0-9a-z])
 &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,8 +18,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 $@