[gjs: 8/12] CI: Drop xvfb-run server-args
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs: 8/12] CI: Drop xvfb-run server-args
- Date: Tue, 20 Aug 2019 19:24:28 +0000 (UTC)
commit 1c7bf21e91084295fc859068558b3ee824fab887
Author: Philip Chimento <philip endlessm com>
Date: Thu Aug 15 11:44:00 2019 -0700
CI: Drop xvfb-run server-args
It's not necessary to run the Xvfb server at any particular resolution
or color depth, the default will be fine.
installed-tests/scripts/testExamples.sh | 2 +-
test/test-ci.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/installed-tests/scripts/testExamples.sh b/installed-tests/scripts/testExamples.sh
index d6bbc447..7265f0e3 100755
--- a/installed-tests/scripts/testExamples.sh
+++ b/installed-tests/scripts/testExamples.sh
@@ -7,7 +7,7 @@ $gjs examples/gio-cat.js Makefile
report "run the gio-cat.js example"
if [[ -n "${ENABLE_GTK}" ]]; then
- export graphical_gjs="xvfb-run -a --server-args='-screen 0 1024x768x24' dbus-run-session -- $gjs"
+ export graphical_gjs="xvfb-run -a dbus-run-session -- $gjs"
eval timeout 5s $graphical_gjs examples/calc.js
report_timeout "run the calc.js example"
diff --git a/test/test-ci.sh b/test/test-ci.sh
index 1f10ce15..673d7ad6 100755
--- a/test/test-ci.sh
+++ b/test/test-ci.sh
@@ -193,9 +193,9 @@ elif [[ $1 == "GJS_EXTRA" ]]; then
do_Set_Env
if [[ "$DEV" == "jhbuild" ]]; then
- xvfb-run -a --server-args="-screen 0 1024x768x24" jhbuild run dbus-run-session --
gnome-desktop-testing-runner gjs
+ xvfb-run -a jhbuild run dbus-run-session -- gnome-desktop-testing-runner gjs
else
- xvfb-run -a --server-args="-screen 0 1024x768x24" dbus-run-session -- gnome-desktop-testing-runner
gjs
+ xvfb-run -a dbus-run-session -- gnome-desktop-testing-runner gjs
fi
elif [[ $1 == "VALGRIND" ]]; then
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]