test-common.make: Fix hardcoded stest references

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

diff --git a/stest/Makefile.in b/stest/Makefile.in
index 40ef0dbb26899a41e0682e93050f1113330b0a26..b16755bc411daa51d09746faaeb5d60a263b9ac5 100644 (file)
--- a/stest/Makefile.in
+++ b/stest/Makefile.in
@@ -10,6 +10,8 @@ DEPS += $(srcdir)/common.tcl
 DEPS += ../secnet
 DEPS += ../test-example/sites.conf
 
+TESTDIR=stest
+
 include ../test-common.make
 
 CFLAGS += -D_REENTRANT -fPIC

diff --git a/test-common.make.in b/test-common.make.in
index fb823352c7fc0692572f08a2423323c98c3d4456..91c00dd8ad6b00f82daf336a413ea97f158235ab 100644 (file)
--- a/test-common.make.in
+++ b/test-common.make.in
@@ -15,7 +15,7 @@ check-real: $(foreach t,$(TESTNAMES),d-$t/ok)
 d-%/ok: $(srcdir)/t-% $(DEPS)
        @rm -rf d-$*; mkdir d-$*
        export STEST_BUILDDIR=$(topbuilddir); \
-       cd $(topdir) && stest/t-$* >$(topbuilddir)/stest/d-$*/log 2>&1
+       cd $(topdir) && $(TESTDIR)/t-$* >$(topbuilddir)/$(TESTDIR)/d-$*/log 2>&1
        @printf "$* "
        @touch $@