summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2018-04-13 13:13:33 +1000
committerDarren Tucker <dtucker@dtucker.net>2018-04-13 13:18:32 +1000
commit4f60e4f66b5880c9f50ef758e8b7f7a9ae786d21 (patch)
tree3a035cfdc3e8c4ea2404d235ee2bb57309b3c6aa
parenta0349a1cc4a18967ad1dbff5389bcdf9da098814 (diff)
Revert $REGRESSTMP changes.
Revert 3fd2d229 and subsequent changes as they turned out to be a portability hassle.
-rw-r--r--Makefile.in4
1 files changed, 1 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index 04e1c8e5..dd942ee7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -577,8 +577,6 @@ regress-binaries: regress/modpipe$(EXEEXT) \
regress/unittests/utf8/test_utf8$(EXEEXT) \
regress/misc/kexfuzz/kexfuzz$(EXEEXT)
-REGRESSTMP = "$(PWD)/regress"
-
tests interop-tests t-exec unit: regress-prep regress-binaries $(TARGETS)
BUILDDIR=`pwd`; \
TEST_SSH_SCP="$${BUILDDIR}/scp"; \
@@ -602,7 +600,7 @@ tests interop-tests t-exec unit: regress-prep regress-binaries $(TARGETS)
.OBJDIR="$${BUILDDIR}/regress" \
.CURDIR="`pwd`" \
BUILDDIR="$${BUILDDIR}" \
- OBJ="$(REGRESSTMP)" \
+ OBJ="$${BUILDDIR}/regress/" \
PATH="$${BUILDDIR}:$${PATH}" \
TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \