KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Michel Dänzer 2021-03-04 18:14:03 +01:00 committed by Marge Bot
parent bc76f9a8f2
commit e7ba882cd4
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci/meson/test-wrapper.sh
View File

@ -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