]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Put minix3 config in the host-specific block.
authorDarren Tucker <dtucker@dtucker.net>
Thu, 27 May 2021 11:23:15 +0000 (21:23 +1000)
committerDarren Tucker <dtucker@dtucker.net>
Mon, 31 May 2021 23:38:26 +0000 (09:38 +1000)
.github/configs

index 653462c851fc7ffbb47995392186a02856bf48e2..3a7f62874a3861c43c449b66a06d9c92e6826a49 100755 (executable)
@@ -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"