Split out rekey test since it runs the longest.

diff --git a/.github/configs b/.github/configs
index 1dfde3a721375c4657a8fa7df726999a15ad5835..895635e9fb3eddc8dceaf5c7e4e54cbd65cdb29e 100755 (executable)
--- 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 1a726fb055178fbb364308fac4ef82b2b1c52d4a..3d55f84559183b2915e0f276d82c30db6276f16e 100644 (file)
--- 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 }