From db6ace73bd7a6e97c3f9d7204d600bce26794279 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 20 Oct 2019 13:07:49 +0100 Subject: [PATCH] test-common.make: Fix hardcoded stest references Signed-off-by: Ian Jackson --- stest/Makefile.in | 2 ++ test-common.make.in | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/stest/Makefile.in b/stest/Makefile.in index 40ef0db..b16755b 100644 --- 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 fb82335..91c00dd 100644 --- 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 $@ -- 2.30.2