Merge commit '6fce06f32c1dd21b5c2d7a142d54b7153d650574'

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

diff --git a/test-common.sd.mk b/test-common.sd.mk
index b605cdcc49d48e0b5fcb59c6949e3e0e7a7a26d6..81b3722fdc71852ad21d46869b3fe3b3524ee7e0 100644 (file)
--- a/test-common.sd.mk
+++ b/test-common.sd.mk
@@ -9,21 +9,23 @@ include common.make
 &DEPS += $(src)/test-common.sd.mk
 &DEPS += &/Subdir.mk
 
-&TARGETS += &check
-
 &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-$* >$(topbuilddir)/&/d-$*/log 2>\&1 \
         || { cat $(topbuilddir)/&/d-$*/log >\&2; false; }
-       @printf "&/$* "
-       @touch $@
+       $(CHECK_SILENT) printf "&/$* "
+       $(CHECK_SILENT) touch $@
 
 &clean::
        $(RM) -f & *.o *.so
        $(RM) -rf & tmp
        $(RM) -rf & d-*
+
+&:include subdirmk/clean.sd.mk