From: Michał Kępień Date: Wed, 7 Apr 2021 09:41:45 +0000 (+0200) Subject: Enforce a run time limit on unit test binaries X-Git-Tag: v9.17.12~13^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bdd55a9b3d2788004d6dd3f61729caf0891a6f4;p=thirdparty%2Fbind9.git Enforce a run time limit on unit test binaries When a unit test binary hangs, the GitLab CI job in which it is run is stuck until its run time limit is exceeded. Furthermore, it is not trivial to determine which test(s) hung in a given GitLab CI job based on its log. To prevent these issues, enforce a run time limit on every binary executed by the lib/unit-test-driver.sh script. Use a timeout of 5 minutes for consistency with older BIND 9 branches, which employed Kyua for running unit tests. Report an exit code of 124 when the run time limit is exceeded for a unit test binary, for consistency with the "timeout" tool included in GNU coreutils. --- diff --git a/lib/unit-test-driver.sh.in b/lib/unit-test-driver.sh.in index 4fbd84b361b..c66649c0d17 100644 --- a/lib/unit-test-driver.sh.in +++ b/lib/unit-test-driver.sh.in @@ -9,9 +9,24 @@ if [ -z "${1}" ]; then fi TEST_PROGRAM="${1}" +TIMEOUT=300 -"${TEST_PROGRAM}" -STATUS=${?} +"${TEST_PROGRAM}" & +TEST_PROGRAM_PID=${!} +STATUS=124 +while [ ${TIMEOUT} -gt 0 ]; do + if ! kill -0 "${TEST_PROGRAM_PID}" 2>/dev/null; then + wait "${TEST_PROGRAM_PID}" + STATUS=${?} + break + fi + sleep 1 + TIMEOUT=$((TIMEOUT - 1)) +done +if [ ${TIMEOUT} -eq 0 ]; then + echo "PID ${TEST_PROGRAM_PID} exceeded run time limit, sending SIGKILL" >&2 + kill -KILL "${TEST_PROGRAM_PID}" 2>/dev/null +fi TEST_PROGRAM_NAME=$(basename "${TEST_PROGRAM}") TEST_PROGRAM_WORK_DIR=$(dirname "${TEST_PROGRAM}")