summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2018-02-19 18:37:40 +1100
committerDarren Tucker <dtucker@dtucker.net>2018-02-19 18:37:40 +1100
commit3fd2d2291a695c96a54269deae079bacce6e3fb9 (patch)
treef43b9b12b6e0ee29bc312fda6acbb44c4c7ba9dd
parentf8338428588f3ecb5243c86336eccaa28809f97e (diff)
Add REGRESSTMP make var override.
Defaults to original location ($srcdir/regress) but allows overriding if desired, eg a directory in /tmp.
-rw-r--r--Makefile.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index 158a0e284..2d9220ba6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -567,6 +567,8 @@ regress-binaries: regress/modpipe$(EXEEXT) \
567 regress/unittests/utf8/test_utf8$(EXEEXT) \ 567 regress/unittests/utf8/test_utf8$(EXEEXT) \
568 regress/misc/kexfuzz/kexfuzz$(EXEEXT) 568 regress/misc/kexfuzz/kexfuzz$(EXEEXT)
569 569
570REGRESSTMP := "$(BUILDDIR)/regress"
571
570tests interop-tests t-exec unit: regress-prep regress-binaries $(TARGETS) 572tests interop-tests t-exec unit: regress-prep regress-binaries $(TARGETS)
571 BUILDDIR=`pwd`; \ 573 BUILDDIR=`pwd`; \
572 TEST_SSH_SCP="$${BUILDDIR}/scp"; \ 574 TEST_SSH_SCP="$${BUILDDIR}/scp"; \
@@ -590,7 +592,7 @@ tests interop-tests t-exec unit: regress-prep regress-binaries $(TARGETS)
590 .OBJDIR="$${BUILDDIR}/regress" \ 592 .OBJDIR="$${BUILDDIR}/regress" \
591 .CURDIR="`pwd`" \ 593 .CURDIR="`pwd`" \
592 BUILDDIR="$${BUILDDIR}" \ 594 BUILDDIR="$${BUILDDIR}" \
593 OBJ="$${BUILDDIR}/regress/" \ 595 OBJ="$(REGRESSTMP)" \
594 PATH="$${BUILDDIR}:$${PATH}" \ 596 PATH="$${BUILDDIR}:$${PATH}" \
595 TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ 597 TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
596 TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ 598 TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \