changelog: start 0.6.8

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

diff --git a/test-common.sd.mk b/test-common.sd.mk
index 81b3722fdc71852ad21d46869b3fe3b3524ee7e0..25bc214911034270c29bbf680bfad71421457443 100644 (file)
--- a/test-common.sd.mk
+++ b/test-common.sd.mk
@@ -1,16 +1,26 @@
+# This file is part of secnet.
+# See LICENCE and this file CREDITS for full list of copyright holders.
+# SPDX-License-Identifier: GPL-3.0-or-later
+# There is NO WARRANTY.
 
 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,14 +28,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