diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2022-11-04 16:59:26 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2022-11-04 17:30:58 +1100 |
| commit | 99500df246ccb736ddbdd04160dcc82165d81a77 (patch) | |
| tree | 4dcc5d6b0f741946d544c3eabbfce9c5d3548235 /.github | |
| parent | 3cae9f92a31897409666aa1e6f696f779759332b (diff) | |
| download | openssh-git-99500df246ccb736ddbdd04160dcc82165d81a77.tar.gz | |
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.
Diffstat (limited to '.github')
| -rwxr-xr-x | .github/configs | 4 | ||||
| -rwxr-xr-x | .github/run_test.sh | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/.github/configs b/.github/configs index 6bf1ab27..1dfde3a7 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 614c9a45..8eeaf5e9 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) |