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

tests/monitor-unit-tests: Make serials more unique

Browse Source 
We fairly consistently had multiple monitors with the whole
vendor,product,serial tuple identical. If we start relying on making
monitors a bit more unique, e.g. for colord integration, we need to make
two monitors connected distinguishable in order for tests to properly
reflect reality and excercise the correct colord integration paths.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2141>
This commit is contained in:
Jonas Ådahl
2021-10-28 15:17:35 +02:00
committed by Marge Bot
parent 972e393fc0
commit f939a7ca29
10 changed files with 107 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tests/meta-monitor-test-utils.c
View File

@ -686,7 +686,7 @@ meta_create_monitor_test_setup (MetaBackend *backend,
int n_possible_crtcs;
int scale;
gboolean is_laptop_panel;
const char *serial;
char *serial;
g_autoptr (MetaOutputInfo) output_info = NULL;
crtc_index = setup->outputs[i].crtc;
@ -729,9 +729,9 @@ meta_create_monitor_test_setup (MetaBackend *backend,
is_laptop_panel = setup->outputs[i].is_laptop_panel;
serial = setup->outputs[i].serial;
serial = g_strdup (setup->outputs[i].serial);
if (!serial)
serial = "0x123456";
serial = g_strdup_printf ("0x123456%d", i);
output_info = meta_output_info_new ();
@ -740,7 +740,7 @@ meta_create_monitor_test_setup (MetaBackend *backend,
: g_strdup_printf ("DP-%d", ++n_normal_panels));
output_info->vendor = g_strdup ("MetaProduct's Inc.");
output_info->product = g_strdup ("MetaMonitor");
output_info->serial = g_strdup (serial);
output_info->serial = serial;
if (setup->outputs[i].hotplug_mode)
{
output_info->hotplug_mode_update = TRUE;