From: Damien Miller <djm@mindrot.org>
Date: Fri, 13 Oct 2023 04:15:05 +0000 (+1100)
Subject: run t-extra regress tests
X-Git-Tag: V_9_6_P1~59
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6eee8c972d5901d10e80634a006b4e346b2c8c19;p=thirdparty%2Fopenssh-portable.git

run t-extra regress tests

This exposes the t-extra regress tests (including agent-pkcs11.sh) as
a new extra-tests target in the top level Makefile and runs them by
default. ok dtucker@
---

diff --git a/Makefile.in b/Makefile.in
index 70287f51f..0acc0366b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -715,7 +715,7 @@ regress-unit-binaries: regress-prep $(REGRESSLIBS) \
 	regress/unittests/sshsig/test_sshsig$(EXEEXT) \
 	regress/unittests/utf8/test_utf8$(EXEEXT)
 
-tests:	file-tests t-exec interop-tests unit
+tests:	file-tests t-exec interop-tests extra-tests unit
 	echo all tests passed
 
 unit: regress-unit-binaries
@@ -726,7 +726,7 @@ unit: regress-unit-binaries
 		OBJ="$(BUILDDIR)/regress" \
 		$@ && echo $@ tests passed
 
-interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS)
+interop-tests t-exec file-tests extra-tests: regress-prep regress-binaries $(TARGETS)
 	cd $(srcdir)/regress || exit $$?; \
 	EGREP='@EGREP@' \
 	OPENSSL_BIN='@OPENSSL_BIN@' \
diff --git a/regress/Makefile b/regress/Makefile
index c21b0215a..a3a35c25f 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -10,6 +10,8 @@ file-tests: $(REGRESS_TARGETS)
 # Interop tests are not run by default
 interop interop-tests: t-exec-interop
 
+extra extra-tests: t-extra
+
 prep:
 	test "x${USE_VALGRIND}" = "x" || mkdir -p $(OBJ)/valgrind-out