Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: Make dbus session automatically exit when X server dies 

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2015-07-18 10:45:03 +02:00
parent 534084698b
commit f2a079204d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/run.sh
View File

@ -18,9 +18,6 @@ else
tests=$this_dir/test*.lua tests=$this_dir/test*.lua
fi fi
# Use a separate D-Bus session; sets $DBUS_SESSION_BUS_PID.
eval $(dbus-launch --sh-syntax)
root_dir=$PWD/.. root_dir=$PWD/..
# Travis. # Travis.
@ -59,6 +56,8 @@ fi
# Toggles debugging mode, using XEPHYR_PAUSE. # Toggles debugging mode, using XEPHYR_PAUSE.
# pkill -USR1 Xephyr # pkill -USR1 Xephyr
# Use a separate D-Bus session; sets $DBUS_SESSION_BUS_PID.
eval $(DISPLAY="$D" dbus-launch --sh-syntax --exit-with-session)
cd $root_dir/build cd $root_dir/build
@ -77,7 +76,7 @@ cd - >/dev/null
kill_childs() { kill_childs() {
for p in $awesome_pid $xserver_pid $DBUS_SESSION_BUS_PID; do for p in $awesome_pid $xserver_pid; do
kill -TERM $p 2>/dev/null || true kill -TERM $p 2>/dev/null || true
done done
} }