chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mtest/t-userv: Test that output conf file is correct
[secnet.git]
/
test-common.sd.mk
diff --git
a/test-common.sd.mk
b/test-common.sd.mk
index b605cdcc49d48e0b5fcb59c6949e3e0e7a7a26d6..2bc48eb1b83d3613e3f57e4b1fe2f57dde2c343a 100644
(file)
--- a/
test-common.sd.mk
+++ b/
test-common.sd.mk
@@
-1,29
+1,36
@@
include common.make
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
&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-real: $(foreach t,$(&TESTNAMES),&d-$t/ok)
+RECHECK_RM += &d-*
+
+CHECK_SILENT ?= @
+
&d-%/ok: &^/t-% $(&DEPS)
&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) && \
export PYTHONBYTECODEBASE=/dev/null; \
cd $(src) && \
- &/t-$* >$(topbuilddir)/&/d-$*/log 2>\&1 \
- || { cat $(topbuilddir)/&/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::
&clean::
- $(RM) -f & *.o *.so
$(RM) -rf & tmp
$(RM) -rf & d-*
$(RM) -rf & tmp
$(RM) -rf & d-*