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

tests/color-management: Use the inherited temporary XDG_DATA_HOME

Browse Source 
Previously these tests tried to write to /usr when run as an
installed-test, which happens to work on Gitlab-CI because we're running
as root inside a container, but will not work when running in a more
realistic scenario as an unprivileged user (which is how Debian's
autopkgtest framework runs this test suite).

This also avoids leaving non-package-manager-managed detritus in /usr.

In color-management-tests, we can just delete the code that sets
XDG_DATA_HOME.

In color-management-profile-conflict-test, we also need to copy
the conflicting vx239-calibrated.icc into the temporary XDG_DATA_HOME
to get onto the code path that this test is intended to exercise.

Resolves: https://gitlab.gnome.org/GNOME/mutter/-/issues/3658
Signed-off-by: Simon McVittie <smcv@debian.org>
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4012>
This commit is contained in:
Simon McVittie 2024-09-07 17:16:48 +01:00 committed by Marge Bot
parent 19f8948164
commit 0024592541
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/tests/color-management-profile-conflict-test.c
View File

@ -107,9 +107,14 @@ init_tests (void)
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
g_autoptr (GError) error = NULL;
g_autoptr (GFile) source_file = NULL;
g_autoptr (GFile) dest_file = NULL;
g_autoptr (MetaContext) context = NULL; g_autoptr (MetaContext) context = NULL;
g_autofree char *system_profile_path = NULL; g_autofree char *system_profile_path = NULL;
g_autofree char *data_home_path = NULL; g_autofree char *dest_dir = NULL;
g_autofree char *dest_path = NULL;
const char *data_home_path = NULL;
context = meta_create_test_context (META_CONTEXT_TEST_TYPE_HEADLESS, context = meta_create_test_context (META_CONTEXT_TEST_TYPE_HEADLESS,
META_CONTEXT_TEST_FLAG_NONE); META_CONTEXT_TEST_FLAG_NONE);
@ -123,11 +128,18 @@ main (int argc, char **argv)
NULL); NULL);
add_colord_system_profile (VX239_ICC_PROFILE_ID, system_profile_path); add_colord_system_profile (VX239_ICC_PROFILE_ID, system_profile_path);
data_home_path = g_test_build_filename (G_TEST_DIST, data_home_path = g_getenv ("XDG_DATA_HOME");
"tests", g_assert_nonnull (data_home_path);
"share",
NULL); dest_dir = g_build_filename (data_home_path,
g_setenv ("XDG_DATA_HOME", data_home_path, TRUE); "icc",
NULL);
g_assert_no_errno (g_mkdir_with_parents (dest_dir, 0755));
dest_path = g_build_filename (dest_dir, "vx239-calibrated.icc", NULL);
source_file = g_file_new_for_path (system_profile_path);
dest_file = g_file_new_for_path (dest_path);
g_file_copy (source_file, dest_file, G_FILE_COPY_NONE, NULL, NULL, NULL, &error);
g_assert_no_error (error);
test_context = context; test_context = context;

8
src/tests/color-management-tests.c
View File

@ -1428,20 +1428,12 @@ int
main (int argc, char **argv) main (int argc, char **argv)
{ {
g_autoptr (MetaContext) context = NULL; g_autoptr (MetaContext) context = NULL;
char *path;
context = meta_create_test_context (META_CONTEXT_TEST_TYPE_TEST, context = meta_create_test_context (META_CONTEXT_TEST_TYPE_TEST,
META_CONTEXT_TEST_FLAG_NONE); META_CONTEXT_TEST_FLAG_NONE);
g_assert (meta_context_configure (context, &argc, &argv, NULL)); g_assert (meta_context_configure (context, &argc, &argv, NULL));
path = g_test_build_filename (G_TEST_BUILT,
"tests",
"share",
NULL);
g_setenv ("XDG_DATA_HOME", path, TRUE);
g_free (path);
test_context = context; test_context = context;
init_tests (); init_tests ();