changelog: work on documentation of changes since ea31544cc33a

[secnet.git] / test-common.sd.mk

diff --git a/test-common.sd.mk b/test-common.sd.mk
index bf9c6cf26a25a9ec4276209bfc80dc2b8c574dcc..0b7f4dffe47d4518e9ef6cc894c89c67f0e34104 100644 (file)
--- 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,8 +22,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 $@