mirror of
https://github.com/davatorium/rofi.git
synced 2024-11-18 13:54:36 -05:00
test-x: Try to run tests without fluxbox
Signed-off-by: Quentin Glidic <sardemff7+git@sardemff7.net>
This commit is contained in:
parent
f6e1c8fe15
commit
faa88343f0
1 changed files with 10 additions and 6 deletions
|
@ -9,9 +9,11 @@ function create_fake_x ( )
|
|||
Xvfb +extension XINERAMA +xinerama -screen 0 1280x1024x24 -screen 1 800x600x24 ${DISPLAY} &>test-x-logs/xserver-:$1.log &
|
||||
XPID=$!
|
||||
sleep 1;
|
||||
timeout -k 30s 30s fluxbox &>test-x-logs/fluxbox-:$1.log &
|
||||
FPID=$!
|
||||
sleep 1
|
||||
if [ -x "$(which fluxbox 2>/dev/null)" ]; then
|
||||
timeout -k 30s 30s fluxbox &>test-x-logs/fluxbox-:$1.log &
|
||||
FPID=$!
|
||||
sleep 1
|
||||
fi
|
||||
}
|
||||
|
||||
function destroy_fake_x ( )
|
||||
|
@ -19,9 +21,11 @@ function destroy_fake_x ( )
|
|||
if [ -n "${XPID}" ]
|
||||
then
|
||||
echo "Stopping fake X: ${XPID} - ${FPID}"
|
||||
kill ${FPID}
|
||||
echo " wait flux"
|
||||
wait ${FPID}
|
||||
if [ -n "${FPID}" ]; then
|
||||
kill ${FPID}
|
||||
echo " wait flux"
|
||||
wait ${FPID}
|
||||
fi
|
||||
kill ${XPID}
|
||||
echo "wait x"
|
||||
wait ${XPID}
|
||||
|
|
Loading…
Reference in a new issue