diff options
author | Darren Tucker <dtucker@dtucker.net> | 2018-04-13 13:13:33 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2018-04-13 13:13:33 +1000 |
commit | 575fac34a97f69bc217b235f81de9f8f433eceed (patch) | |
tree | 12566813a635c609884b4931eb5305de54a24761 | |
parent | 10479cc2a4acd6faaf643eb305233b49d70c31c1 (diff) |
Revert $REGRESSTMP changes.
Revert 3fd2d229 and subsequent changes as they turned out to be a
portability hassle.
-rw-r--r-- | Makefile.in | 4 |
1 files changed, 1 insertions, 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) \ | |||
577 | regress/unittests/utf8/test_utf8$(EXEEXT) \ | 577 | regress/unittests/utf8/test_utf8$(EXEEXT) \ |
578 | regress/misc/kexfuzz/kexfuzz$(EXEEXT) | 578 | regress/misc/kexfuzz/kexfuzz$(EXEEXT) |
579 | 579 | ||
580 | REGRESSTMP = "$(PWD)/regress" | ||
581 | |||
582 | tests interop-tests t-exec unit: regress-prep regress-binaries $(TARGETS) | 580 | tests interop-tests t-exec unit: regress-prep regress-binaries $(TARGETS) |
583 | BUILDDIR=`pwd`; \ | 581 | BUILDDIR=`pwd`; \ |
584 | TEST_SSH_SCP="$${BUILDDIR}/scp"; \ | 582 | TEST_SSH_SCP="$${BUILDDIR}/scp"; \ |
@@ -602,7 +600,7 @@ tests interop-tests t-exec unit: regress-prep regress-binaries $(TARGETS) | |||
602 | .OBJDIR="$${BUILDDIR}/regress" \ | 600 | .OBJDIR="$${BUILDDIR}/regress" \ |
603 | .CURDIR="`pwd`" \ | 601 | .CURDIR="`pwd`" \ |
604 | BUILDDIR="$${BUILDDIR}" \ | 602 | BUILDDIR="$${BUILDDIR}" \ |
605 | OBJ="$(REGRESSTMP)" \ | 603 | OBJ="$${BUILDDIR}/regress/" \ |
606 | PATH="$${BUILDDIR}:$${PATH}" \ | 604 | PATH="$${BUILDDIR}:$${PATH}" \ |
607 | TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ | 605 | TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ |
608 | TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ | 606 | TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ |