]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Point TEST_SSH_MODULI_FILE at our own moduli.
authorDarren Tucker <dtucker@dtucker.net>
Sat, 13 Mar 2021 02:51:26 +0000 (13:51 +1100)
committerDarren Tucker <dtucker@dtucker.net>
Sat, 13 Mar 2021 02:51:26 +0000 (13:51 +1100)
This will allow the test to run without requiring a moduli file
installed at the configured default path.

Makefile.in

index e3cd296cabb06fc01f995849bde51eade688e9d1..15db373d22a2a190b705469c264ef9cd8886f968 100644 (file)
@@ -16,6 +16,7 @@ sysconfdir=@sysconfdir@
 piddir=@piddir@
 srcdir=@srcdir@
 top_srcdir=@top_srcdir@
+abs_top_srcdir=@abs_top_srcdir@
 
 DESTDIR=
 VPATH=@srcdir@
@@ -699,6 +700,7 @@ interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS)
                TEST_SSH_PKCS11_HELPER="$${BUILDDIR}/ssh-pkcs11-helper" \
                TEST_SSH_SK_HELPER="$${BUILDDIR}/ssh-sk-helper" \
                TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server" \
+               TEST_SSH_MODULI_FILE="$(abs_top_srcdir)/moduli" \
                TEST_SSH_PLINK="plink" \
                TEST_SSH_PUTTYGEN="puttygen" \
                TEST_SSH_CONCH="conch" \