brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Make the test backend derive from the native backend

Browse Source 
It's constructed as a native backend headless backend, but uses a custom
monitor manager (based on MetaMonitorManagerNative) that creates a fake
monitor. Rendering is unconditionally done with the surfaceless
renderer.

The test devices used now use virtual devices, meaning some changes to
the tests to e.g. not set names, and not dealing with input devices
directly.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3812>
This commit is contained in:
Jonas Ådahl
2024-06-14 23:59:11 +02:00
committed by Marge Bot
parent e6fc515ea4
commit bed5875f30
19 changed files with 170 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/backends/native/meta-backend-native.c
View File

@ -143,6 +143,7 @@ meta_backend_native_create_default_seat (MetaBackend *backend,
{
case META_BACKEND_NATIVE_MODE_DEFAULT:
case META_BACKEND_NATIVE_MODE_HEADLESS:
case META_BACKEND_NATIVE_MODE_TEST_HEADLESS:
seat_id = meta_backend_native_get_seat_id (backend_native);
break;
case META_BACKEND_NATIVE_MODE_TEST_VKMS:
@ -346,6 +347,7 @@ meta_backend_native_get_seat_id (MetaBackendNative *backend_native)
case META_BACKEND_NATIVE_MODE_TEST_VKMS:
return meta_launcher_get_seat_id (priv->launcher);
case META_BACKEND_NATIVE_MODE_HEADLESS:
case META_BACKEND_NATIVE_MODE_TEST_HEADLESS:
return "seat0";
}
g_assert_not_reached ();
@ -358,7 +360,8 @@ meta_backend_native_is_headless (MetaBackend *backend)
MetaBackendNativePrivate *priv =
meta_backend_native_get_instance_private (backend_native);
return priv->mode == META_BACKEND_NATIVE_MODE_HEADLESS;
return (priv->mode == META_BACKEND_NATIVE_MODE_HEADLESS ||
priv->mode == META_BACKEND_NATIVE_MODE_TEST_HEADLESS);
}
static void
@ -567,6 +570,8 @@ should_ignore_device (MetaBackendNative *backend_native,
case META_BACKEND_NATIVE_MODE_DEFAULT:
case META_BACKEND_NATIVE_MODE_HEADLESS:
return meta_is_udev_device_ignore (device);
case META_BACKEND_NATIVE_MODE_TEST_HEADLESS:
return TRUE;
case META_BACKEND_NATIVE_MODE_TEST_VKMS:
return !meta_is_udev_test_device (device);
}
@ -645,6 +650,7 @@ init_gpus (MetaBackendNative *native,
device_type = META_UDEV_DEVICE_TYPE_CARD;
break;
case META_BACKEND_NATIVE_MODE_HEADLESS:
case META_BACKEND_NATIVE_MODE_TEST_HEADLESS:
device_type = META_UDEV_DEVICE_TYPE_RENDER_NODE;
break;
}
@ -740,6 +746,7 @@ meta_backend_native_initable_init (GInitable *initable,
case META_BACKEND_NATIVE_MODE_DEFAULT:
break;
case META_BACKEND_NATIVE_MODE_HEADLESS:
case META_BACKEND_NATIVE_MODE_TEST_HEADLESS:
break;
case META_BACKEND_NATIVE_MODE_TEST_VKMS:
session_id = "dummy";
@ -747,7 +754,8 @@ meta_backend_native_initable_init (GInitable *initable,
break;
}
if (priv->mode != META_BACKEND_NATIVE_MODE_HEADLESS)
if (priv->mode != META_BACKEND_NATIVE_MODE_HEADLESS &&
priv->mode != META_BACKEND_NATIVE_MODE_TEST_HEADLESS)
{
priv->launcher = meta_launcher_new (backend,
session_id, seat_id,
@ -918,6 +926,7 @@ meta_backend_native_activate_vt (MetaBackendNative *backend_native,
case META_BACKEND_NATIVE_MODE_DEFAULT:
return meta_launcher_activate_vt (launcher, vt, error);
case META_BACKEND_NATIVE_MODE_HEADLESS:
case META_BACKEND_NATIVE_MODE_TEST_HEADLESS:
case META_BACKEND_NATIVE_MODE_TEST_VKMS:
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Can't switch VT while headless");