subdirmk: Implement new syntax

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

diff --git a/test-common.sd.mk b/test-common.sd.mk
index b605cdcc49d48e0b5fcb59c6949e3e0e7a7a26d6..b830264e55908b3998b3079bf24e1b4e2a84ef9a 100644 (file)
--- a/test-common.sd.mk
+++ b/test-common.sd.mk
@@ -1,7 +1,7 @@
 
 include common.make
 
-&TESTSCRIPTS ?= $(shell echo &^/t-*[0-9a-z])
+&TESTSCRIPTS ?= $(shell echo &,t-*[0-9a-z])
 &TESTNAMES := $(patsubst t-%,%,$(notdir $(&TESTSCRIPTS)))
 
 &DEPS += $(src)/test-common.tcl
@@ -13,15 +13,17 @@ include common.make
 
 &check-real: $(foreach t,$(&TESTNAMES),&d-$t/ok)
 
-&d-%/ok: &^/t-% $(&DEPS)
-       @rm -rf &d-$*; mkdir &d-$*
-       @export SECNET_TEST_BUILDDIR=$(topbuilddir); \
+CHECK_SILENT ?= @
+
+&d-%/ok: &,t-% $(&DEPS)
+       $(CHECK_SILENT) rm -rf &d-$*; mkdir &d-$*
+       $(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; }
-       @printf "&/$* "
-       @touch $@
+       $(CHECK_SILENT) printf "&/$* "
+       $(CHECK_SILENT) touch $@
 
 &clean::
        $(RM) -f & *.o *.so