diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2021-03-04 18:14:03 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-03-16 15:32:33 +0000 |
| commit | e7ba882cd42ceca7f2d2a961279fca2631a76ab0 (patch) | |
| tree | 21bac7b3d27442dff82e5c34719848b369fb42c5 /.gitlab-ci | |
| parent | bc76f9a8f239558ce74652c51ba5ff46b0c45914 (diff) | |
ci: Drop SIGINT handling from meson test wrapper script
Not needed, I had misread meson code.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9472>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/meson/test-wrapper.sh | 3 |
1 files changed, 1 insertions, 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 |