]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Revert $REGRESSTMP changes.
authorDarren Tucker <dtucker@dtucker.net>
Fri, 13 Apr 2018 03:13:33 +0000 (13:13 +1000)
committerDarren Tucker <dtucker@dtucker.net>
Fri, 13 Apr 2018 03:13:33 +0000 (13:13 +1000)
Revert 3fd2d229 and subsequent changes as they turned out to be a
portability hassle.

Makefile.in

index 8d33e533d9937ccdf27679f085318e60f01151e0..2cd48553841955cf4a5418f2f4a5c28ebb512149 100644 (file)
@@ -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@" \