]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Add REGRESSTMP make var override.
authorDarren Tucker <dtucker@dtucker.net>
Mon, 19 Feb 2018 07:37:40 +0000 (18:37 +1100)
committerDarren Tucker <dtucker@dtucker.net>
Mon, 19 Feb 2018 07:37:40 +0000 (18:37 +1100)
Defaults to original location ($srcdir/regress) but allows overriding
if desired, eg a directory in /tmp.

Makefile.in

index 158a0e284a5bdddaf5d401cffa743f97a9e56f0a..2d9220ba693132a7635413b0aaa3c6bfa9a6ce02 100644 (file)
@@ -567,6 +567,8 @@ regress-binaries: regress/modpipe$(EXEEXT) \
        regress/unittests/utf8/test_utf8$(EXEEXT) \
        regress/misc/kexfuzz/kexfuzz$(EXEEXT)
 
+REGRESSTMP := "$(BUILDDIR)/regress"
+
 tests interop-tests t-exec unit: regress-prep regress-binaries $(TARGETS)
        BUILDDIR=`pwd`; \
        TEST_SSH_SCP="$${BUILDDIR}/scp"; \
@@ -590,7 +592,7 @@ tests interop-tests t-exec unit: regress-prep regress-binaries $(TARGETS)
                .OBJDIR="$${BUILDDIR}/regress" \
                .CURDIR="`pwd`" \
                BUILDDIR="$${BUILDDIR}" \
-               OBJ="$${BUILDDIR}/regress/" \
+               OBJ="$(REGRESSTMP)" \
                PATH="$${BUILDDIR}:$${PATH}" \
                TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
                TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \