subdirmk: Merge new version and fix everything

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

diff --git a/test-common.sd.mk b/test-common.sd.mk
index e8bfcd3a69cd3f9b5f60f3d06fc2fe9f596163ea..023e41c7976dca43cffcaadc33563f565b15b2b1 100644 (file)
--- a/test-common.sd.mk
+++ b/test-common.sd.mk
@@ -5,25 +5,26 @@ include common.make
 &TESTNAMES := $(patsubst t-%,%,$(notdir $(&TESTSCRIPTS)))
 
 &DEPS += $(src)/test-common.tcl
-&DEPS += $(src)/common.make
+&DEPS += common.make
 &DEPS += $(src)/test-common.sd.mk
-&DEPS += &/Subdir.mk
-
-&TARGETS += &check
+&DEPS += &/Dir.mk
 
 &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-$* >&d-$*/log 2>\&1 \
-        || { cat &d-$*/log >\&2; false; }
-       @printf "&/$* "
-       @touch $@
+        &/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-*