From: Darren Tucker <dtucker@dtucker.net>
Date: Thu, 27 May 2021 11:23:15 +0000 (+1000)
Subject: Put minix3 config in the host-specific block.
X-Git-Tag: V_8_7_P1~187
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a3a1dd2c7d4461962acbcc0ebee9445ba892be0;p=thirdparty%2Fopenssh-portable.git

Put minix3 config in the host-specific block.
---

diff --git a/.github/configs b/.github/configs
index 653462c85..3a7f62874 100755
--- a/.github/configs
+++ b/.github/configs
@@ -42,17 +42,6 @@ case "$config" in
     libedit)
 	CONFIGFLAGS="--with-libedit"
 	;;
-    minix3)
-	CC=clang
-	CONFIGFLAGS="--with-ssl-dir=/usr/pkg"
-	LTESTS="proxy-connect"
-	SKIP_LTESTS="addrmatch cfgparse key-options reexec agent connect"
-	SKIP_LTESTS="$SKIP_LTESTS keyscan rekey allow-deny-users connect-uri"
-	SKIP_LTESTS="$SKIP_LTESTS knownhosts-command sftp-uri brokenkeys"
-	SKIP_LTESTS="$SKIP_LTESTS exit-status login-timeout stderr-data"
-	SKIP_LTESTS="$SKIP_LTESTS cfgmatch forward-control multiplex transfer"
-	SKIP_LTESTS="$SKIP_LTESTS cfgmatchlisten forwarding reconfigure"
-	;;
     pam-krb5)
 	CONFIGFLAGS="--with-pam --with-kerberos5"
 	SSHD_CONFOPTS="UsePam yes"
@@ -125,6 +114,20 @@ case "$config" in
 esac
 
 case "${TARGET_HOST}" in
+    minix3)
+	CC="clang"
+	LIBCRYPTOFLAGS="--without-openssl"
+	# Minix does not have a loopback interface so we have to skip any
+	# test that relies on it.
+	TEST_TARGET=t-exec
+	SKIP_LTESTS="addrmatch cfgparse key-options reexec agent connect"
+	SKIP_LTESTS="$SKIP_LTESTS keyscan rekey allow-deny-users connect-uri"
+	SKIP_LTESTS="$SKIP_LTESTS knownhosts-command sftp-uri brokenkeys"
+	SKIP_LTESTS="$SKIP_LTESTS exit-status login-timeout stderr-data"
+	SKIP_LTESTS="$SKIP_LTESTS cfgmatch forward-control multiplex transfer"
+	SKIP_LTESTS="$SKIP_LTESTS cfgmatchlisten forwarding reconfigure"
+	SUDO=""
+	;;
     nbsd4)
 	# System compiler will ICE on some files with fstack-protector
 	CONFIGFLAGS="${CONFIGFLAGS} --without-hardening"