[SCM] kitemmodels packaging branch, master, updated. debian/5.37.0-2-98-g81bf18c
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Jan 2 18:45:58 UTC 2018
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kitemmodels.git;a=commitdiff;h=f4481ba
The following commit has been merged in the master branch:
commit f4481babc093dd6412446ef35699ee2951b556d0
Author: Harald Sitter <sitter at kde.org>
Date: Wed May 4 11:33:47 2016 +0200
kill children to make sure testsuite exits
---
debian/tests/testsuite | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
index c7e77d6..23cc102 100755
--- a/debian/tests/testsuite
+++ b/debian/tests/testsuite
@@ -3,6 +3,6 @@
xvfb-run -a --server-args="-screen 0 1024x768x24" \
Xephyr -reset -br -screen 1024x768 :2 & x_pid=$!
-trap "kill ${x_pid}" EXIT
+trap "pkill -TERM -P ${x_pid}; kill ${x_pid}" EXIT
DISPLAY=:2 dbus-launch --exit-with-session dh_auto_test
--
kitemmodels packaging
More information about the pkg-kde-commits
mailing list