From 4bfddbb3f87e93c6fc27d44304afa79fbaf540df Mon Sep 17 00:00:00 2001 From: Uli Schlachter Date: Thu, 13 Aug 2015 12:59:57 +0200 Subject: [PATCH] tests/run.sh: Start Xvfb with -noreset When using Xephyr, this already starts the server with -noreset, but for Xvfb we also need this flag. Without this flag, the DPI value that is set via xrdb gets lost at server reset. This wasn't a problem before commit 6d4837a53abb. That commit moved the launch of the dbus session after the setting of the DPI. So previously, waiting for server startup was half broken (the dbus session already tried to connect to the server to check for when it shuts down), but due to this no server reset occurred and thus the DPI was correctly applied. After this commit, the server immediately resets after xrdb is done setting the DPI and the value set is lost. Signed-off-by: Uli Schlachter --- tests/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run.sh b/tests/run.sh index 4983f8c1d..3d06fa0ee 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -41,7 +41,7 @@ D=:5 SIZE=1024x768 if [ $HEADLESS = 1 ]; then - "$XVFB" $D -screen 0 ${SIZE}x24 & + "$XVFB" $D -noreset -screen 0 ${SIZE}x24 & xserver_pid=$! else # export XEPHYR_PAUSE=1000