tests: Always use the bundled cursor theme
To not depend on the system cursor theme for tests, always use our own, even if the cursor theme appearance makes no difference. We also need to add all of Adwaita's cursors in tree, to avoid any test arbitrarily triggering missing cursor warnings or errors. Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4307>
@ -672,7 +672,6 @@ main (int argc,
|
||||
char **argv)
|
||||
{
|
||||
g_autoptr (MetaContext) context = NULL;
|
||||
g_autofree char *path = NULL;
|
||||
|
||||
context = meta_create_test_context (META_CONTEXT_TEST_TYPE_TEST,
|
||||
(META_CONTEXT_TEST_FLAG_NO_X11 |
|
||||
@ -682,9 +681,6 @@ main (int argc,
|
||||
meta_context_test_set_background_color (META_CONTEXT_TEST (context),
|
||||
COGL_COLOR_INIT (255, 255, 255, 255));
|
||||
|
||||
path = g_test_build_filename (G_TEST_DIST, "tests", "xcursors", NULL);
|
||||
g_setenv ("XCURSOR_PATH", path, TRUE);
|
||||
|
||||
test_context = context;
|
||||
|
||||
init_tests ();
|
||||
|
@ -82,6 +82,15 @@ ensure_gsettings_memory_backend (void)
|
||||
G_TYPE_FROM_INSTANCE (default_backend));
|
||||
}
|
||||
|
||||
static void
|
||||
ensure_xcursor_path (void)
|
||||
{
|
||||
g_autofree char *xcursor_path = NULL;
|
||||
|
||||
xcursor_path = g_test_build_filename (G_TEST_DIST, "xcursors", NULL);
|
||||
g_setenv ("XCURSOR_PATH", xcursor_path, TRUE);
|
||||
}
|
||||
|
||||
static void
|
||||
meta_context_test_finalize (GObject *object)
|
||||
{
|
||||
@ -125,6 +134,7 @@ meta_context_test_configure (MetaContext *context,
|
||||
meta_context_set_plugin_gtype (context, META_TYPE_TEST_SHELL);
|
||||
|
||||
ensure_gsettings_memory_backend ();
|
||||
ensure_xcursor_path ();
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
BIN
src/tests/xcursors/default/cursors/alias
Normal file
BIN
src/tests/xcursors/default/cursors/alias.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/all-scroll
Normal file
BIN
src/tests/xcursors/default/cursors/all-scroll.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/cell
Normal file
BIN
src/tests/xcursors/default/cursors/cell.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/col-resize
Normal file
BIN
src/tests/xcursors/default/cursors/col-resize.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/context-menu
Normal file
BIN
src/tests/xcursors/default/cursors/context-menu.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/copy
Normal file
BIN
src/tests/xcursors/default/cursors/copy.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/crosshair
Normal file
BIN
src/tests/xcursors/default/cursors/crosshair.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/default.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/e-resize
Normal file
BIN
src/tests/xcursors/default/cursors/e-resize.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/ew-resize
Normal file
BIN
src/tests/xcursors/default/cursors/ew-resize.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/grab
Normal file
BIN
src/tests/xcursors/default/cursors/grab.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/grabbing
Normal file
BIN
src/tests/xcursors/default/cursors/grabbing.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/help
Normal file
BIN
src/tests/xcursors/default/cursors/help.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/move.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/n-resize
Normal file
BIN
src/tests/xcursors/default/cursors/n-resize.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/ne-resize
Normal file
BIN
src/tests/xcursors/default/cursors/ne-resize.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/nesw-resize
Normal file
BIN
src/tests/xcursors/default/cursors/nesw-resize.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/no-drop
Normal file
BIN
src/tests/xcursors/default/cursors/no-drop.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/not-allowed
Normal file
BIN
src/tests/xcursors/default/cursors/not-allowed.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/ns-resize
Normal file
BIN
src/tests/xcursors/default/cursors/ns-resize.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/nw-resize
Normal file
BIN
src/tests/xcursors/default/cursors/nw-resize.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/nwse-resize
Normal file
BIN
src/tests/xcursors/default/cursors/nwse-resize.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/pointer
Normal file
BIN
src/tests/xcursors/default/cursors/pointer.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/progress
Normal file
BIN
src/tests/xcursors/default/cursors/progress.ani
Normal file
BIN
src/tests/xcursors/default/cursors/row-resize
Normal file
BIN
src/tests/xcursors/default/cursors/row-resize.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/s-resize
Normal file
BIN
src/tests/xcursors/default/cursors/s-resize.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/se-resize
Normal file
BIN
src/tests/xcursors/default/cursors/se-resize.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/sw-resize
Normal file
BIN
src/tests/xcursors/default/cursors/sw-resize.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/text
Normal file
BIN
src/tests/xcursors/default/cursors/text.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/vertical-text
Normal file
BIN
src/tests/xcursors/default/cursors/vertical-text.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/w-resize
Normal file
BIN
src/tests/xcursors/default/cursors/w-resize.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/wait
Normal file
BIN
src/tests/xcursors/default/cursors/wait.ani
Normal file
BIN
src/tests/xcursors/default/cursors/zoom-in
Normal file
BIN
src/tests/xcursors/default/cursors/zoom-in.cur
Normal file
After Width: | Height: | Size: 72 KiB |
BIN
src/tests/xcursors/default/cursors/zoom-out
Normal file
BIN
src/tests/xcursors/default/cursors/zoom-out.cur
Normal file
After Width: | Height: | Size: 72 KiB |