From 99500df246ccb736ddbdd04160dcc82165d81a77 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@dtucker.net>
Date: Fri, 4 Nov 2022 16:59:26 +1100
Subject: [PATCH] Don't run openbsd-compat tests on Cygwin.

Add "compat-tests" to the default TEST_TARGET so we can override as
necessary.  Override TEST_TARGET for Cygwin as the tests don't currently
compile there.
---
 .github/configs     | 4 +++-
 .github/run_test.sh | 3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/configs b/.github/configs
index 6bf1ab27f..1dfde3a72 100755
--- a/.github/configs
+++ b/.github/configs
@@ -12,7 +12,7 @@ config=$1
 
 unset CC CFLAGS CPPFLAGS LDFLAGS LTESTS SUDO
 
-TEST_TARGET="tests"
+TEST_TARGET="tests compat-tests"
 LTESTS=""
 SKIP_LTESTS=""
 SUDO=sudo	# run with sudo by default
@@ -260,6 +260,8 @@ esac
 case "`./config.guess`" in
 *cygwin)
 	SUDO=""
+	# Don't run compat tests on cygwin as they don't currently compile.
+	TEST_TARGET="tests"
 	;;
 *-darwin*)
 	# Unless specified otherwise, build without OpenSSL on Mac OS since
diff --git a/.github/run_test.sh b/.github/run_test.sh
index 614c9a450..8eeaf5e9b 100755
--- a/.github/run_test.sh
+++ b/.github/run_test.sh
@@ -46,6 +46,3 @@ if [ ! -z "${SSHD_CONFOPTS}" ]; then
         make t-exec SKIP_LTESTS="${SKIP_LTESTS}" LTESTS="${LTESTS}" TEST_SSH_SSHD_CONFOPTS="${SSHD_CONFOPTS}"
     fi
 fi
-
-echo
-(cd openbsd-compat/regress && make)