X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=test-common.sd.mk;h=023e41c7976dca43cffcaadc33563f565b15b2b1;hb=05e7c4d2f7a59ba5f6b7c3bfd91eef721363a853;hp=81b3722fdc71852ad21d46869b3fe3b3524ee7e0;hpb=c2fe245748bf2110bc6acf823f266715b08707db;p=secnet.git

diff --git a/test-common.sd.mk b/test-common.sd.mk
index 81b3722..023e41c 100644
--- a/test-common.sd.mk
+++ b/test-common.sd.mk
@@ -7,7 +7,7 @@ include common.make
 &DEPS += $(src)/test-common.tcl
 &DEPS += common.make
 &DEPS += $(src)/test-common.sd.mk
-&DEPS += &/Subdir.mk
+&DEPS += &/Dir.mk
 
 &check-real: $(foreach t,$(&TESTNAMES),&d-$t/ok)
 
@@ -18,14 +18,13 @@ CHECK_SILENT ?= @
 	$(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-*
-
-&:include subdirmk/clean.sd.mk