Move rekey test into valgrind-2.

Now that the rekey test has been optimized it's fast enough to not be in
its own valgrind test, so move it into valgrind-2, which is currently
the quickest of the others, bringing all of them to roughly the same
runtime of ~1.1 hours.

diff --git a/.github/configs b/.github/configs
index 6134cb6ed5e919af9b236fef8c6307ee7300ff7d..4f47f820b50641dd2954e57301c736b740f0fe0b 100755 (executable)
--- a/.github/configs
+++ b/.github/configs
@@ -187,7 +187,7 @@ case "$config" in
        LIBCRYPTOFLAGS="--without-openssl"
        TEST_TARGET=t-exec
        ;;
-    valgrind-[1-5]|valgrind-unit)
+    valgrind-[1-4]|valgrind-unit)
        # rlimit sandbox and FORTIFY_SOURCE confuse Valgrind.
        CONFIGFLAGS="--without-sandbox --without-hardening"
        CONFIGFLAGS="$CONFIGFLAGS --with-cppflags=-D_FORTIFY_SOURCE=0"
@@ -197,10 +197,9 @@ case "$config" in
        # 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 separate tests.
-       tests2="integrity try-ciphers"
+       tests2="integrity try-ciphers rekey"
        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),
@@ -220,9 +219,6 @@ 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 609028703f8093fa2eef7f6da57ed971e69303a7..c179f73d16e07f34f8e5e769aafcde4b261ff6d4 100644 (file)
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -32,7 +32,6 @@ jobs:
           - { target: ubuntu-20.04, config: valgrind-2 }
           - { target: ubuntu-20.04, config: valgrind-3 }
           - { target: ubuntu-20.04, config: valgrind-4 }
-          - { target: ubuntu-20.04, config: valgrind-5 }
           - { target: ubuntu-20.04, config: valgrind-unit }
           - { target: ubuntu-20.04, config: c89 }
           - { target: ubuntu-20.04, config: clang-6.0 }