Module: Mesa Branch: master Commit: e7ba882cd42ceca7f2d2a961279fca2631a76ab0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e7ba882cd42ceca7f2d2a961279fca2631a76ab0
Author: Michel Dänzer <[email protected]> Date: Thu Mar 4 18:14:03 2021 +0100 ci: Drop SIGINT handling from meson test wrapper script Not needed, I had misread meson code. Reviewed-by: Adam Jackson <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9472> --- .gitlab-ci/meson/test-wrapper.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci/meson/test-wrapper.sh b/.gitlab-ci/meson/test-wrapper.sh index 1bb91927090..aece02734a3 100755 --- a/.gitlab-ci/meson/test-wrapper.sh +++ b/.gitlab-ci/meson/test-wrapper.sh @@ -6,7 +6,7 @@ if ! test -f /usr/bin/time; then fi -# If the test times out, meson sends SIGINT & SIGTERM signals to this process. +# If the test times out, meson sends SIGTERM to this process. # Simply exec'ing "time" would result in no output from that in this case. # Instead, we need to run "time" in the background, catch the signals and # propagate them to the actual test process. @@ -16,7 +16,6 @@ TIMEPID=$! TESTPID=$(ps --ppid $TIMEPID -o pid=) if test "x$TESTPID" != x; then - trap 'kill -INT $TESTPID; wait $TIMEPID; exit $?' INT trap 'kill -TERM $TESTPID; wait $TIMEPID; exit $?' TERM fi _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
