summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2020-04-22 12:09:40 +1000
committerDarren Tucker <dtucker@dtucker.net>2020-04-22 12:09:40 +1000
commitcecde6a41689d0ae585ec903b190755613a6de79 (patch)
treec65b223d2814337327f8d43e0bb9019e38bc2a55 /Makefile.in
parent300c4322b92e98d3346efa0aec1c094c94d0f964 (diff)
Put the values from env vars back.
This merges the values from the recently removed environment into make's command line arguments since we actually need those.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in36
1 files changed, 18 insertions, 18 deletions
diff --git a/Makefile.in b/Makefile.in
index 4f514c8db..304d96cd0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -680,24 +680,24 @@ interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS)
680 PATH="$${BUILDDIR}:$${PATH}" \ 680 PATH="$${BUILDDIR}:$${PATH}" \
681 TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ 681 TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
682 TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ 682 TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
683 TEST_SSH_SCP="$${TEST_SSH_SCP}" \ 683 TEST_SSH_SCP="$${BUILDDIR}/scp" \
684 TEST_SSH_SSH="$${TEST_SSH_SSH}" \ 684 TEST_SSH_SSH="$${BUILDDIR}/ssh" \
685 TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \ 685 TEST_SSH_SSHD="$${BUILDDIR}/sshd" \
686 TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \ 686 TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent" \
687 TEST_SSH_SSHADD="$${TEST_SSH_SSHADD}" \ 687 TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add" \
688 TEST_SSH_SSHKEYGEN="$${TEST_SSH_SSHKEYGEN}" \ 688 TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen" \
689 TEST_SSH_SSHPKCS11HELPER="$${TEST_SSH_SSHPKCS11HELPER}" \ 689 TEST_SSH_SSHPKCS11HELPER="$${BUILDDIR}/ssh-pkcs11-helper" \
690 TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \ 690 TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan" \
691 TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \ 691 TEST_SSH_SFTP="$${BUILDDIR}/sftp" \
692 TEST_SSH_PKCS11_HELPER="$${TEST_SSH_PKCS11_HELPER}" \ 692 TEST_SSH_PKCS11_HELPER="$${BUILDDIR}/ssh-pkcs11-helper" \
693 TEST_SSH_SK_HELPER="$${TEST_SSH_SK_HELPER}" \ 693 TEST_SSH_SK_HELPER="$${BUILDDIR}/ssh-sk-helper" \
694 TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ 694 TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server" \
695 TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \ 695 TEST_SSH_PLINK="plink" \
696 TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \ 696 TEST_SSH_PUTTYGEN="puttygen" \
697 TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \ 697 TEST_SSH_CONCH="conch" \
698 TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \ 698 TEST_SSH_IPV6="@TEST_SSH_IPV6@" \
699 TEST_SSH_UTF8="$${TEST_SSH_UTF8}" \ 699 TEST_SSH_UTF8="@TEST_SSH_UTF8@" \
700 TEST_SSH_ECC="$${TEST_SSH_ECC}" \ 700 TEST_SSH_ECC="@TEST_SSH_ECC@" \
701 TEST_SHELL="${TEST_SHELL}" \ 701 TEST_SHELL="${TEST_SHELL}" \
702 EXEEXT="$(EXEEXT)" \ 702 EXEEXT="$(EXEEXT)" \
703 $@ && echo all $@ passed 703 $@ && echo all $@ passed