edu4rdshl/gnome-shell
1
0
Fork 0
mirror of https://github.com/edu4rdshl/gnome-shell.git synced 2026-07-17 23:24:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: Stop using nested test backend

Browse source 
It is replaced with a new test backend that uses the native backend
running in headless mode.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3373>
This commit is contained in:
Jonas Ådahl 2024-06-16 22:28:51 +02:00 • committed by Sebastian Wick
parent e1868cab1a
commit 63153a0af1
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.gitlab-ci.yml
View file

@ -215,8 +215,9 @@ test:
before_script: before_script:
- sudo meson install -C mutter/build - sudo meson install -C mutter/build
- mkdir -m 700 $XDG_RUNTIME_DIR - mkdir -m 700 $XDG_RUNTIME_DIR
- mkdir -m 1777 /tmp/.X11-unix
script: script:
- dbus-run-session -- xvfb-run meson test -C build --no-rebuild --timeout-multiplier 5 - dbus-run-session -- meson test -C build --no-rebuild --timeout-multiplier 5
artifacts: artifacts:
expire_in: 1 day expire_in: 1 day
paths: paths:
@ -289,8 +290,9 @@ dist:
before_script: before_script:
- sudo meson install -C mutter/build - sudo meson install -C mutter/build
- mkdir -m 700 $XDG_RUNTIME_DIR - mkdir -m 700 $XDG_RUNTIME_DIR
- mkdir -m 1777 /tmp/.X11-unix
script: script:
- dbus-run-session xvfb-run meson dist -C build --include-subprojects - dbus-run-session meson dist -C build --include-subprojects
rules: rules:
- if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
changes: changes:

2
src/st/test-theme.c
View file

@ -550,7 +550,7 @@ main (int argc, char **argv)
/* meta_init() cds to $HOME */ /* meta_init() cds to $HOME */
cwd = g_get_current_dir (); cwd = g_get_current_dir ();
context = meta_create_test_context (META_CONTEXT_TEST_TYPE_NESTED, context = meta_create_test_context (META_CONTEXT_TEST_TYPE_TEST,
META_CONTEXT_TEST_FLAG_NONE); META_CONTEXT_TEST_FLAG_NONE);
if (!meta_context_configure (context, &argc, &argv, &error)) if (!meta_context_configure (context, &argc, &argv, &error))
g_error ("Failed to configure: %s", error->message); g_error ("Failed to configure: %s", error->message);