summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDave Davenport <qball@gmpclient.org>2016-01-05 16:46:43 +0100
committerDave Davenport <qball@gmpclient.org>2016-01-05 16:46:43 +0100
commit68220a5b58e5ba1c8c7f9c47fded41a84627e023 (patch)
tree78d85bd47e6220eec716267b6625b06a193d09f5 /test
parent200f8e5faae0b56b52294ccff15560a13a42f582 (diff)
Add fluxbox as wm for tests.
Diffstat (limited to 'test')
-rwxr-xr-xtest/run_test.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/test/run_test.sh b/test/run_test.sh
index dc1f13e1..2e276960 100755
--- a/test/run_test.sh
+++ b/test/run_test.sh
@@ -1,12 +1,15 @@
#!/usr/bin/env bash
XPID=
+FPID=
function create_fake_x ( )
{
export DISPLAY=":$1"
echo "Starting fake X: ${DISPLAY}"
Xvfb ${DISPLAY} &
XPID=$!
+ fluxbox &
+ FPID=$!
sleep 1
}
@@ -14,7 +17,9 @@ function destroy_fake_x ( )
{
if [ -n "${XPID}" ]
then
- echo "Stopping fake X: ${XPID}"
+ echo "Stopping fake X: ${XPID} - ${FPID}"
+ kill ${FPID}
+ wait ${FPID}
kill ${XPID}
wait ${XPID}
fi