From 575fac34a97f69bc217b235f81de9f8f433eceed Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 13 Apr 2018 13:13:33 +1000 Subject: Revert $REGRESSTMP changes. Revert 3fd2d229 and subsequent changes as they turned out to be a portability hassle. --- Makefile.in | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 8d33e533d..2cd485538 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@" \ -- cgit v1.2.3