diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2022-10-28 15:50:10 +0200 |
|---|---|---|
| committer | Marge Bot <marge-bot@gnome.org> | 2022-11-01 21:04:21 +0000 |
| commit | 1b65fedc9b8e1d15552d95d48094d5af05b3b012 (patch) | |
| tree | a6f3b42028c57e244cf7fdfe7a9e358f93156394 | |
| parent | ec18a1d7ae474fdfd70a51f1c6f607607eac4a2c (diff) | |
| download | mutter-1b65fedc9b8e1d15552d95d48094d5af05b3b012.tar.gz | |
ci: Only launch a single mocked D-Bus environment for all tests
This cuts away a lot of time wasted on spawning and tearing down D-Bus
daemons and mocked service for every test case.
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2678>
| -rw-r--r-- | .gitlab-ci.yml | 20 | ||||
| -rwxr-xr-x | .gitlab-ci/run-meson.sh | 8 |
2 files changed, 13 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c24c5268f..1a48077dd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -367,11 +367,15 @@ build-without-native-backend-and-wayland@x86_64: - .test-mutter-base script: - glib-compile-schemas $GSETTINGS_SCHEMA_DIR - - dbus-run-session -- xvfb-run -a -s "$XVFB_SERVER_ARGS" - ./.gitlab-ci/run-meson.sh test -C build - --no-suite 'mutter/kvm' - --no-rebuild - --timeout-multiplier 10 + - xvfb-run -a -s "$XVFB_SERVER_ARGS" + ./src/tests/meta-dbus-runner.py + --launch=wireplumber + meson test + -C build + --setup plain + --no-suite 'mutter/kvm' + --no-rebuild + --timeout-multiplier 10 artifacts: reports: junit: "build/meson-logs/testlog.junit.xml" @@ -495,8 +499,10 @@ dist-mutter: - meson . build --werror --prefix /usr -Dbuildtype=debugoptimized - glib-compile-schemas $GSETTINGS_SCHEMA_DIR - - dbus-run-session -- xvfb-run -a -s "$XVFB_SERVER_ARGS" - ./.gitlab-ci/run-meson.sh dist -C build + - xvfb-run -a -s "$XVFB_SERVER_ARGS" + ./src/tests/meta-dbus-runner.py + --launch=wireplumber + meson dist -C build rules: - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: diff --git a/.gitlab-ci/run-meson.sh b/.gitlab-ci/run-meson.sh deleted file mode 100755 index 759117e2e..000000000 --- a/.gitlab-ci/run-meson.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/bash - -set -e - -wireplumber & -sleep 1 - -meson "$@" |