From 56a5cd1337ddcd33223106d7d872b0d1a3fbc7e0 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 8 Jan 2019 12:16:37 +0000 Subject: [PATCH] trash test: Don't assume that ~/.local exists In a minimal autobuilder environment, this test could conceivably be the first thing to refer to ~/.local. Modified by Iain Lane : Don't try to create ~/.local from tests, but skip if it doesn't exist. Signed-off-by: Simon McVittie --- gio/tests/trash.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gio/tests/trash.c b/gio/tests/trash.c index 1055585e5..b7df9363a 100644 --- a/gio/tests/trash.c +++ b/gio/tests/trash.c @@ -107,8 +107,19 @@ test_trash_symlinks (void) g_test_bug ("1522"); - /* The test assumes that ~/.local always exists. */ target = g_build_filename (g_get_home_dir (), ".local", NULL); + + if (!g_file_test (target, G_FILE_TEST_IS_DIR)) + { + gchar *message; + + message = g_strdup_printf ("Directory '%s' does not exist", target); + g_test_skip (message); + g_free (message); + g_free (target); + return; + } + target_mount = g_unix_mount_for (target, NULL); g_assert_nonnull (target_mount); g_test_message ("Target: %s (mount: %s)", target, g_unix_mount_get_mount_path (target_mount));