diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2020-04-22 12:09:40 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2020-04-22 12:09:40 +1000 |
| commit | cecde6a41689d0ae585ec903b190755613a6de79 (patch) | |
| tree | c65b223d2814337327f8d43e0bb9019e38bc2a55 | |
| parent | 300c4322b92e98d3346efa0aec1c094c94d0f964 (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.
| -rw-r--r-- | Makefile.in | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/Makefile.in b/Makefile.in index 4f514c8d..304d96cd 100644 --- a/Makefile.in +++ b/Makefile.in @@ -680,24 +680,24 @@ interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS) PATH="$${BUILDDIR}:$${PATH}" \ TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ TEST_MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ - TEST_SSH_SCP="$${TEST_SSH_SCP}" \ - TEST_SSH_SSH="$${TEST_SSH_SSH}" \ - TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \ - TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \ - TEST_SSH_SSHADD="$${TEST_SSH_SSHADD}" \ - TEST_SSH_SSHKEYGEN="$${TEST_SSH_SSHKEYGEN}" \ - TEST_SSH_SSHPKCS11HELPER="$${TEST_SSH_SSHPKCS11HELPER}" \ - TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \ - TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \ - TEST_SSH_PKCS11_HELPER="$${TEST_SSH_PKCS11_HELPER}" \ - TEST_SSH_SK_HELPER="$${TEST_SSH_SK_HELPER}" \ - TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \ - TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \ - TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \ - TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \ - TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \ - TEST_SSH_UTF8="$${TEST_SSH_UTF8}" \ - TEST_SSH_ECC="$${TEST_SSH_ECC}" \ + TEST_SSH_SCP="$${BUILDDIR}/scp" \ + TEST_SSH_SSH="$${BUILDDIR}/ssh" \ + TEST_SSH_SSHD="$${BUILDDIR}/sshd" \ + TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent" \ + TEST_SSH_SSHADD="$${BUILDDIR}/ssh-add" \ + TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen" \ + TEST_SSH_SSHPKCS11HELPER="$${BUILDDIR}/ssh-pkcs11-helper" \ + TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan" \ + TEST_SSH_SFTP="$${BUILDDIR}/sftp" \ + TEST_SSH_PKCS11_HELPER="$${BUILDDIR}/ssh-pkcs11-helper" \ + TEST_SSH_SK_HELPER="$${BUILDDIR}/ssh-sk-helper" \ + TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server" \ + TEST_SSH_PLINK="plink" \ + TEST_SSH_PUTTYGEN="puttygen" \ + TEST_SSH_CONCH="conch" \ + TEST_SSH_IPV6="@TEST_SSH_IPV6@" \ + TEST_SSH_UTF8="@TEST_SSH_UTF8@" \ + TEST_SSH_ECC="@TEST_SSH_ECC@" \ TEST_SHELL="${TEST_SHELL}" \ EXEEXT="$(EXEEXT)" \ $@ && echo all $@ passed |