summaryrefslogtreecommitdiffstats
path: root/run_test_suite
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2013-02-26 00:50:17 +0100
committerTails developers <amnesia@boum.org>2013-03-08 01:47:04 +0100
commit01967ee73a58099f0e42e0801a2e81df6aa78013 (patch)
tree08bf0441a773226fbd8fbe47226403c8fe8ce0b9 /run_test_suite
parentaab3312ebaa4afc40f963c07281847266f581e05 (diff)
Only kill Xvfb on exit if it is still running.
This is to suppress an annoying error that happen on script exit. Why Xvfb quits on its own most of the time is unclear to me, though.
Diffstat (limited to 'run_test_suite')
-rwxr-xr-xrun_test_suite2
1 files changed, 1 insertions, 1 deletions
diff --git a/run_test_suite b/run_test_suite
index 38e70d0..e371e46 100755
--- a/run_test_suite
+++ b/run_test_suite
@@ -51,7 +51,7 @@ next_free_display() {
start_xvfb() {
Xvfb $TARGET_DISPLAY -screen 0 1024x768x24+32 >/dev/null 2>&1 &
XVFB_PID=$!
- trap "kill -9 ${XVFB_PID}" EXIT
+ trap "kill -0 ${XVFB_PID} 2>/dev/null && kill -9 ${XVFB_PID}" EXIT
# Wait for Xvfb to run on TARGET_DISPLAY
until display_in_use $TARGET_DISPLAY; do
sleep 1