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 b830264e55908b3998b3079bf24e1b4e2a84ef9a..023e41c7976dca43cffcaadc33563f565b15b2b1 100644 (file)
--- a/test-common.sd.mk
+++ b/test-common.sd.mk
@@ -1,31 +1,30 @@
 
 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
 &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)
+&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; }
+        &/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-*