tests/run.sh: Start dbus after X server startup
The code does some dances with xrdb to ensure that the server finished starting up. However, before this it already tries to access the server via dbus-launch. Since nothing uses dbus in this part of the code, we can just move this down. Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
parent
a166f86864
commit
6d4837a53a
|
@ -50,9 +50,6 @@ else
|
||||||
# ( sleep 1; kill -USR1 $xserver_pid ) &
|
# ( sleep 1; kill -USR1 $xserver_pid ) &
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 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
|
||||||
|
|
||||||
LUA_PATH="$(lua -e 'print(package.path)');lib/?.lua;lib/?/init.lua"
|
LUA_PATH="$(lua -e 'print(package.path)');lib/?.lua;lib/?/init.lua"
|
||||||
|
@ -101,6 +98,9 @@ while true; do
|
||||||
sleep 0.05
|
sleep 0.05
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# Use a separate D-Bus session; sets $DBUS_SESSION_BUS_PID.
|
||||||
|
eval $(DISPLAY="$D" dbus-launch --sh-syntax --exit-with-session)
|
||||||
|
|
||||||
|
|
||||||
AWESOME_CLIENT="$root_dir/utils/awesome-client"
|
AWESOME_CLIENT="$root_dir/utils/awesome-client"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue