From 6d4837a53abb04bbceff99ec91c9fe8b26c6430d Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Wed, 5 Aug 2015 17:10:56 +0200 Subject: [PATCH] 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 --- tests/run.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/run.sh b/tests/run.sh index 2134a703..f239dc7f 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -50,9 +50,6 @@ else # ( sleep 1; kill -USR1 $xserver_pid ) & 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 LUA_PATH="$(lua -e 'print(package.path)');lib/?.lua;lib/?/init.lua" @@ -101,6 +98,9 @@ while true; do sleep 0.05 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"