tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-25 23:05:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Further split Valgrind tests.

Browse Source 
Even split in two, the Valgrind tests take by far the longest to run,
so split them four ways to further increase parallelism.
This commit is contained in:
Darren Tucker 2021-04-07 10:05:10 +10:00
parent 961af266b8
commit 3674e33fa7
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
.github/configs vendored
View File

@ -56,22 +56,35 @@ case "$config" in
LIBCRYPTOFLAGS="--without-openssl" LIBCRYPTOFLAGS="--without-openssl"
TEST_TARGET=t-exec TEST_TARGET=t-exec
;; ;;
valgrind-1) valgrind-[1-4])
# rlimit sandbox and FORTIFY_SOURCE confuse Valgrind. # rlimit sandbox and FORTIFY_SOURCE confuse Valgrind.
CONFIGFLAGS="--without-sandbox --without-hardening" CONFIGFLAGS="--without-sandbox --without-hardening"
CONFIGFLAGS="$CONFIGFLAGS --with-cppflags=-D_FORTIFY_SOURCE=0" CONFIGFLAGS="$CONFIGFLAGS --with-cppflags=-D_FORTIFY_SOURCE=0"
TEST_TARGET="t-exec USE_VALGRIND=1"
TEST_SSH_ELAPSED_TIMES=1
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. # by github so split into three separate tests.
TEST_TARGET="t-exec USE_VALGRIND=1" tests2="rekey integrity"
SKIP_LTESTS="agent-timeout rekey try-ciphers cert-userkey integrity" tests3="krl forward-control sshsig"
;; tests4="cert-userkey cert-hostkey kextype sftp-perm keygen-comment"
valgrind-2) case "$config" in
CONFIGFLAGS="--without-sandbox --without-hardening" valgrind-1)
CONFIGFLAGS="$CONFIGFLAGS --with-cppflags=-D_FORTIFY_SOURCE=0" # All tests except agent-timeout (which is flaky under valgrind)
# The rekey test takes >30 min so run separately. #) and slow ones that run separately to increase parallelism.
TEST_TARGET="t-exec USE_VALGRIND=1" SKIP_LTESTS="agent-timeout ${tests2} ${tests3} ${tests4}"
LTESTS="rekey try-ciphers cert-userkey integrity" ;;
valgrind-2)
LTESTS="${tests2}"
;;
valgrind-3)
LTESTS="${tests3}"
;;
valgrind-4)
LTESTS="${tests4}"
;;
esac
;; ;;
*) *)
echo "Unknown configuration $config" echo "Unknown configuration $config"

2
.github/workflows/c-cpp.yml vendored
View File

@ -20,6 +20,8 @@ jobs:
include: include:
- { os: ubuntu-20.04, configs: valgrind-1 } - { os: ubuntu-20.04, configs: valgrind-1 }
- { 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-4 }
- { os: ubuntu-20.04, configs: pam } - { os: ubuntu-20.04, configs: pam }
- { os: ubuntu-20.04, configs: kitchensink } - { os: ubuntu-20.04, configs: kitchensink }
- { os: ubuntu-20.04, configs: hardenedmalloc } - { os: ubuntu-20.04, configs: hardenedmalloc }