From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 14 Nov 2019 01:49:36 +0000 (+0000)
Subject: build system: Fix out of tree builds again
X-Git-Tag: v0.5.1~25
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=1986272f4c095ea415866ec3606ccf8c03412730

build system: Fix out of tree builds again

"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>
---

diff --git a/test-common.sd.mk b/test-common.sd.mk
index e8bfcd3..b605cdc 100644
--- a/test-common.sd.mk
+++ b/test-common.sd.mk
@@ -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 $@