[mutter] ci: Run whole run-tests.sh in a D-Bus session
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] ci: Run whole run-tests.sh in a D-Bus session
- Date: Fri, 12 Mar 2021 15:43:46 +0000 (UTC)
commit 2be09ce0452ecbca65d040e26b6fa002b3c6acce
Author: Jonas Ã…dahl <jadahl gmail com>
Date: Sat Feb 13 18:46:13 2021 +0100
ci: Run whole run-tests.sh in a D-Bus session
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1698>
.gitlab-ci.yml | 3 ++-
.gitlab-ci/run-tests.sh | 7 ++-----
2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c57faef9d0..32612bff60 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -254,7 +254,8 @@ build-without-native-backend-and-wayland@x86_64:
MALLOC_CHECK_: "3"
NO_AT_BRIDGE: "1"
script:
- - bash -x ./.gitlab-ci/run-tests.sh
+ - mkdir -m 700 $XDG_RUNTIME_DIR
+ - dbus-run-session -- bash -x ./.gitlab-ci/run-tests.sh
artifacts:
expire_in: 1 day
reports:
diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh
index 63726d1171..76b67934ff 100755
--- a/.gitlab-ci/run-tests.sh
+++ b/.gitlab-ci/run-tests.sh
@@ -3,15 +3,12 @@
set +e
dconf update
-
-mkdir -m 700 $XDG_RUNTIME_DIR
glib-compile-schemas $GSETTINGS_SCHEMA_DIR
export MUTTER_DEBUG_DUMMY_MODE_SPECS="800x600@10.0"
-dbus-run-session -- \
- xvfb-run -s '+iglx -noreset' \
- meson test -C build --no-rebuild -t 10 --wrap catchsegv
+xvfb-run -s '+iglx -noreset' \
+ meson test -C build --no-rebuild -t 10 --wrap catchsegv
exit_code=$?
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]