From 4e316ff0f18a118232bb9ac6512ee62773a9e8ea Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Tue, 8 Nov 2022 09:17:04 +1100 Subject: [PATCH] Split out rekey test since it runs the longest. --- .github/configs | 10 +++++++--- .github/workflows/c-cpp.yml | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/configs b/.github/configs index 1dfde3a72..895635e9f 100755 --- a/.github/configs +++ b/.github/configs @@ -161,16 +161,17 @@ case "$config" in export TEST_SSH_ELAPSED_TIMES # Valgrind slows things down enough that the agent timeout test # won't reliably pass, and the unit tests run longer than allowed - # by github so split into three separate tests. - tests2="rekey integrity try-ciphers" + # by github so split into separate tests. + tests2="integrity try-ciphers" tests3="krl forward-control sshsig agent-restrict kextype sftp" tests4="cert-userkey cert-hostkey kextype sftp-perm keygen-comment percent" + tests5="rekey" case "$config" in valgrind-1) # All tests except agent-timeout (which is flaky under valgrind) # and hostbased (since valgrind won't let ssh exec keysign). # 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) LTESTS="${tests2}" @@ -181,6 +182,9 @@ case "$config" in valgrind-4) LTESTS="${tests4}" ;; + valgrind-5) + LTESTS="${tests5}" + ;; valgrind-unit) TEST_TARGET="unit USE_VALGRIND=1" ;; diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 1a726fb05..3d55f8455 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -24,6 +24,7 @@ jobs: - { os: ubuntu-20.04, configs: valgrind-2 } - { os: ubuntu-20.04, configs: valgrind-3 } - { 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: c89 } - { os: ubuntu-20.04, configs: clang-6.0 }