From: Darren Tucker <dtucker@dtucker.net>
Date: Sat, 13 Mar 2021 02:51:26 +0000 (+1100)
Subject: Point TEST_SSH_MODULI_FILE at our own moduli.
X-Git-Tag: V_8_6_P1~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c054538fccf92b4a028008321d3711107bee6d5;p=thirdparty%2Fopenssh-portable.git

Point TEST_SSH_MODULI_FILE at our own moduli.

This will allow the test to run without requiring a moduli file
installed at the configured default path.
---

diff --git a/Makefile.in b/Makefile.in
index e3cd296ca..15db373d2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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" \