diff options
| -rw-r--r-- | ci/common/suite.sh | 10 | ||||
| -rwxr-xr-x | ci/run_lint.sh | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/ci/common/suite.sh b/ci/common/suite.sh index e22252c985..568d5d5bee 100644 --- a/ci/common/suite.sh +++ b/ci/common/suite.sh @@ -60,6 +60,12 @@ run_test() { } run_test_wd() { + local hang_ok= + if test "x$1" = "x--allow-hang" ; then + hang_ok=1 + shift + fi + local timeout="$1" test $# -gt 0 && shift @@ -105,7 +111,9 @@ run_test_wd() { # status file not updated, assuming hang kill -KILL $pid if test $restarts -eq 0 ; then - fail "${test_name}" E "Test hang up" + if test "x$hang_ok" = "x" ; then + fail "${test_name}" E "Test hang up" + fi else echo "Test ${test_name} hang up, restarting" eval "$restart_cmd" diff --git a/ci/run_lint.sh b/ci/run_lint.sh index 2c30615725..927bcbf6b5 100755 --- a/ci/run_lint.sh +++ b/ci/run_lint.sh @@ -20,6 +20,7 @@ csi_clean() { run_test 'top_make clint-full' clint run_test 'top_make testlint' testlint CLICOLOR_FORCE=1 run_test_wd \ + --allow-hang \ 5s \ 'top_make check-single-includes' \ 'csi_clean' \ |