diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2022-11-03 17:43:40 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2022-11-03 17:43:40 +0100 |
| commit | b95faccf03e5213b6087626ab8d46e0704aad6b5 (patch) | |
| tree | f9d560f2004f951d8efbf1024292a88366d8efd7 /mk/run_test.sh | |
| parent | 47dec825c5daeeb9d615eb4d1eead3dbaa06c7c9 (diff) | |
| parent | dd1970c233a82328445b69e903574e14115ee933 (diff) | |
Merge remote-tracking branch 'origin/master' into auto-uid-allocation
Diffstat (limited to 'mk/run_test.sh')
| -rwxr-xr-x | mk/run_test.sh | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/mk/run_test.sh b/mk/run_test.sh index 3783d3bf7..7e95df2ac 100755 --- a/mk/run_test.sh +++ b/mk/run_test.sh @@ -14,9 +14,27 @@ if [ -t 1 ]; then yellow="[33;1m" normal="[m" fi -(cd tests && env ${TESTS_ENVIRONMENT} init.sh 2>/dev/null > /dev/null) -log="$(cd $(dirname $1) && env ${TESTS_ENVIRONMENT} $(basename $1) 2>&1)" -status=$? + +run_test () { + (cd tests && env ${TESTS_ENVIRONMENT} init.sh 2>/dev/null > /dev/null) + log="$(cd $(dirname $1) && env ${TESTS_ENVIRONMENT} $(basename $1) 2>&1)" + status=$? +} + +run_test "$1" + +# Hack: Retry the test if it fails with “unexpected EOF reading a line” as these +# appear randomly without anyone knowing why. +# See https://github.com/NixOS/nix/issues/3605 for more info +if [[ $status -ne 0 && $status -ne 99 && \ + "$(uname)" == "Darwin" && \ + "$log" =~ "unexpected EOF reading a line" \ +]]; then + echo "$post_run_msg [${yellow}FAIL$normal] (possibly flaky, so will be retried)" + echo "$log" | sed 's/^/ /' + run_test "$1" +fi + if [ $status -eq 0 ]; then echo "$post_run_msg [${green}PASS$normal]" elif [ $status -eq 99 ]; then |