isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-08-10 02:14:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove meta_is_stage_views_enabled()

Browse Source 
This is an old relic from when ClutterStageView was being added, and
tests were somewhat prepared to be able to test the "X11 style" of
things, with the nested backend some how managing to emulate that.

Lets drop that stuff, it isn't used by the test suite, and isn't useful
anyway; if we want to test X11 configurations, we should use the actual
X11 backend, which didn't make use of this anyway.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2619>
This commit is contained in:
Jonas Ådahl
2022-05-27 20:36:14 +02:00
committed by Marge Bot
parent d517f3ae61
commit fc8a4afc45
10 changed files with 9 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/tests/meta-monitor-manager-test.c
View File

@@ -112,8 +112,6 @@ void
meta_monitor_manager_test_set_handles_transforms (MetaMonitorManagerTest *manager_test,
gboolean handles_transforms)
{
g_assert (handles_transforms || meta_is_stage_views_enabled());
manager_test->handles_transforms = handles_transforms;
}
@@ -145,14 +143,7 @@ meta_monitor_manager_test_ensure_initial_config (MetaMonitorManager *manager)
config = meta_monitor_manager_ensure_configured (manager);
if (meta_is_stage_views_enabled ())
{
meta_monitor_manager_update_logical_state (manager, config);
}
else
{
meta_monitor_manager_update_logical_state_derived (manager, NULL);
}
meta_monitor_manager_update_logical_state (manager, config);
}
static void
@@ -261,10 +252,7 @@ meta_monitor_manager_test_apply_monitors_config (MetaMonitorManager *manage
manager->screen_width = META_MONITOR_MANAGER_MIN_SCREEN_WIDTH;
manager->screen_height = META_MONITOR_MANAGER_MIN_SCREEN_HEIGHT;
if (meta_is_stage_views_enabled ())
meta_monitor_manager_rebuild (manager, NULL);
else
meta_monitor_manager_rebuild_derived (manager, config);
meta_monitor_manager_rebuild (manager, NULL);
return TRUE;
}
@@ -293,10 +281,7 @@ meta_monitor_manager_test_apply_monitors_config (MetaMonitorManager *manage
update_screen_size (manager, config);
if (meta_is_stage_views_enabled ())
meta_monitor_manager_rebuild (manager, config);
else
meta_monitor_manager_rebuild_derived (manager, config);
meta_monitor_manager_rebuild (manager, config);
return TRUE;
}
@@ -399,21 +384,12 @@ meta_monitor_manager_test_get_max_screen_size (MetaMonitorManager *manager,
int *max_width,
int *max_height)
{
if (meta_is_stage_views_enabled ())
return FALSE;
*max_width = 65535;
*max_height = 65535;
return TRUE;
return FALSE;
}
static MetaLogicalMonitorLayoutMode
meta_monitor_manager_test_get_default_layout_mode (MetaMonitorManager *manager)
{
if (!meta_is_stage_views_enabled ())
return META_LOGICAL_MONITOR_LAYOUT_MODE_PHYSICAL;
if (is_monitor_framebuffer_scaled ())
return META_LOGICAL_MONITOR_LAYOUT_MODE_LOGICAL;
else

18
src/tests/monitor-store-unit-tests.c
View File

@@ -537,12 +537,6 @@ meta_test_monitor_store_scale (void)
.n_configurations = 1
};
if (!meta_is_stage_views_enabled ())
{
g_test_skip ("Not using stage views");
return;
}
meta_set_custom_monitor_config (test_context, "scale.xml");
check_monitor_store_configurations (&expect);
@@ -587,12 +581,6 @@ meta_test_monitor_store_fractional_scale (void)
.n_configurations = 1
};
if (!meta_is_stage_views_enabled ())
{
g_test_skip ("Not using stage views");
return;
}
meta_set_custom_monitor_config (test_context, "fractional-scale.xml");
check_monitor_store_configurations (&expect);
@@ -637,12 +625,6 @@ meta_test_monitor_store_high_precision_fractional_scale (void)
.n_configurations = 1
};
if (!meta_is_stage_views_enabled ())
{
g_test_skip ("Not using stage views");
return;
}
meta_set_custom_monitor_config (test_context, "high-precision-fractional-scale.xml");
check_monitor_store_configurations (&expect);

60
src/tests/monitor-unit-tests.c
View File

@@ -1533,12 +1533,6 @@ meta_test_monitor_hidpi_linear_config (void)
};
MetaMonitorTestSetup *test_setup;
if (!meta_is_stage_views_enabled ())
{
g_test_skip ("Not using stage views");
return;
}
test_setup = meta_create_monitor_test_setup (test_backend,
&test_case.setup,
MONITOR_TEST_FLAG_NO_STORED);
@@ -3094,12 +3088,6 @@ meta_test_monitor_lid_scaled_closed_opened (void)
MetaMonitorManager *monitor_manager =
meta_backend_get_monitor_manager (backend);
if (!meta_is_stage_views_enabled ())
{
g_test_skip ("Not using stage views");
return;
}
test_setup = meta_create_monitor_test_setup (test_backend,
&test_case.setup,
MONITOR_TEST_FLAG_NONE);
@@ -4523,12 +4511,6 @@ meta_test_monitor_orientation_initial_stored_rotated (void)
MetaOrientation orientation;
unsigned int times_signalled = 0;
if (!meta_is_stage_views_enabled ())
{
g_test_skip ("Not using stage views");
return;
}
g_test_message ("%s", G_STRFUNC);
orientation_mock = meta_sensors_proxy_mock_get ();
touch_device = meta_test_add_touch_device (backend);
@@ -4683,12 +4665,6 @@ meta_test_monitor_orientation_initial_stored_rotated_no_touch (void)
MetaOrientation orientation;
unsigned int times_signalled = 0;
if (!meta_is_stage_views_enabled ())
{
g_test_skip ("Not using stage views");
return;
}
g_test_message ("%s", G_STRFUNC);
orientation_mock = meta_sensors_proxy_mock_get ();
orientation = META_ORIENTATION_RIGHT_UP;
@@ -5960,12 +5936,6 @@ meta_test_monitor_custom_scale_config (void)
};
MetaMonitorTestSetup *test_setup;
if (!meta_is_stage_views_enabled ())
{
g_test_skip ("Not using stage views");
return;
}
test_setup = meta_create_monitor_test_setup (test_backend,
&test_case.setup,
MONITOR_TEST_FLAG_NONE);
@@ -6062,12 +6032,6 @@ meta_test_monitor_custom_fractional_scale_config (void)
};
MetaMonitorTestSetup *test_setup;
if (!meta_is_stage_views_enabled ())
{
g_test_skip ("Not using stage views");
return;
}
test_setup = meta_create_monitor_test_setup (test_backend,
&test_case.setup,
MONITOR_TEST_FLAG_NONE);
@@ -6164,12 +6128,6 @@ meta_test_monitor_custom_high_precision_fractional_scale_config (void)
};
MetaMonitorTestSetup *test_setup;
if (!meta_is_stage_views_enabled ())
{
g_test_skip ("Not using stage views");
return;
}
test_setup = meta_create_monitor_test_setup (test_backend,
&test_case.setup,
MONITOR_TEST_FLAG_NONE);
@@ -6308,12 +6266,6 @@ meta_test_monitor_custom_tiled_config (void)
};
MetaMonitorTestSetup *test_setup;
if (!meta_is_stage_views_enabled ())
{
g_test_skip ("Not using stage views");
return;
}
test_setup = meta_create_monitor_test_setup (test_backend,
&test_case.setup,
MONITOR_TEST_FLAG_NONE);
@@ -6471,12 +6423,6 @@ meta_test_monitor_custom_tiled_custom_resolution_config (void)
};
MetaMonitorTestSetup *test_setup;
if (!meta_is_stage_views_enabled ())
{
g_test_skip ("Not using stage views");
return;
}
test_setup = meta_create_monitor_test_setup (test_backend,
&test_case.setup,
MONITOR_TEST_FLAG_NONE);
@@ -7621,12 +7567,6 @@ meta_test_monitor_custom_second_rotated_nonnative_config (void)
MetaMonitorManagerTest *monitor_manager_test =
META_MONITOR_MANAGER_TEST (monitor_manager);
if (!meta_is_stage_views_enabled ())
{
g_test_skip ("Not using stage views");
return;
}
meta_monitor_manager_test_set_handles_transforms (monitor_manager_test,
FALSE);