Split out rekey test since it runs the longest.

This commit is contained in:
Darren Tucker 2022-11-08 09:17:04 +11:00
parent 21625a6424
commit 4e316ff0f1
No known key found for this signature in database
2 changed files with 8 additions and 3 deletions

10
.github/configs vendored
View File

@ -161,16 +161,17 @@ case "$config" in
export TEST_SSH_ELAPSED_TIMES export TEST_SSH_ELAPSED_TIMES
# Valgrind slows things down enough that the agent timeout test # Valgrind slows things down enough that the agent timeout test
# won't reliably pass, and the unit tests run longer than allowed # won't reliably pass, and the unit tests run longer than allowed
# by github so split into three separate tests. # by github so split into separate tests.
tests2="rekey integrity try-ciphers" tests2="integrity try-ciphers"
tests3="krl forward-control sshsig agent-restrict kextype sftp" tests3="krl forward-control sshsig agent-restrict kextype sftp"
tests4="cert-userkey cert-hostkey kextype sftp-perm keygen-comment percent" tests4="cert-userkey cert-hostkey kextype sftp-perm keygen-comment percent"
tests5="rekey"
case "$config" in case "$config" in
valgrind-1) valgrind-1)
# All tests except agent-timeout (which is flaky under valgrind) # All tests except agent-timeout (which is flaky under valgrind)
# and hostbased (since valgrind won't let ssh exec keysign). # and hostbased (since valgrind won't let ssh exec keysign).
# Slow ones are run separately to increase parallelism. # Slow ones are run separately to increase parallelism.
SKIP_LTESTS="agent-timeout hostbased ${tests2} ${tests3} ${tests4}" SKIP_LTESTS="agent-timeout hostbased ${tests2} ${tests3} ${tests4} ${tests5}"
;; ;;
valgrind-2) valgrind-2)
LTESTS="${tests2}" LTESTS="${tests2}"
@ -181,6 +182,9 @@ case "$config" in
valgrind-4) valgrind-4)
LTESTS="${tests4}" LTESTS="${tests4}"
;; ;;
valgrind-5)
LTESTS="${tests5}"
;;
valgrind-unit) valgrind-unit)
TEST_TARGET="unit USE_VALGRIND=1" TEST_TARGET="unit USE_VALGRIND=1"
;; ;;

View File

@ -24,6 +24,7 @@ jobs:
- { os: ubuntu-20.04, configs: valgrind-2 } - { os: ubuntu-20.04, configs: valgrind-2 }
- { os: ubuntu-20.04, configs: valgrind-3 } - { os: ubuntu-20.04, configs: valgrind-3 }
- { os: ubuntu-20.04, configs: valgrind-4 } - { os: ubuntu-20.04, configs: valgrind-4 }
- { os: ubuntu-20.04, configs: valgrind-5 }
- { os: ubuntu-20.04, configs: valgrind-unit } - { os: ubuntu-20.04, configs: valgrind-unit }
- { os: ubuntu-20.04, configs: c89 } - { os: ubuntu-20.04, configs: c89 }
- { os: ubuntu-20.04, configs: clang-6.0 } - { os: ubuntu-20.04, configs: clang-6.0 }