chiark / gitweb /
build system: Fix out of tree builds again
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 14 Nov 2019 01:49:36 +0000 (01:49 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 14 Nov 2019 01:49:36 +0000 (01:49 +0000)
"build system: convert stest and mtest to Subdir.mk" broke this by
referring to the wrong paths.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
test-common.sd.mk

index e8bfcd3a69cd3f9b5f60f3d06fc2fe9f596163ea..b605cdcc49d48e0b5fcb59c6949e3e0e7a7a26d6 100644 (file)
@@ -5,7 +5,7 @@ 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
 
@@ -18,8 +18,8 @@ include common.make
        @export SECNET_TEST_BUILDDIR=$(topbuilddir); \
         export PYTHONBYTECODEBASE=/dev/null; \
         cd $(src) && \
-        &^/t-$* >&d-$*/log 2>\&1 \
-        || { cat &d-$*/log >\&2; false; }
+        &/t-$* >$(topbuilddir)/&/d-$*/log 2>\&1 \
+        || { cat $(topbuilddir)/&/d-$*/log >\&2; false; }
        @printf "&/$* "
        @touch $@