Commit b50447b0 authored by Philip Withnall's avatar Philip Withnall

Merge branch 'issue1906' into 'master'

gutils test: Don't assume that every Unix OS implements os-release(5)

Closes #1906

See merge request !1159
parents 0869cded f9a1970a
Pipeline #122363 passed with stages
in 25 minutes and 37 seconds
......@@ -520,15 +520,30 @@ test_desktop_special_dir (void)
static void
test_os_info (void)
#if defined (G_OS_UNIX) || defined (G_OS_WIN32)
gchar *name;
gchar *contents = NULL;
/* Whether this is implemented or not, it must not crash */
name = g_get_os_info (G_OS_INFO_KEY_NAME);
g_assert (name != NULL);
g_free (name);
g_test_message ("%s: %s",
name == NULL ? "(null)" : name);
#if defined (G_OS_WIN32) || defined (__APPLE__)
/* These OSs have a special case so NAME should always succeed */
g_assert_nonnull (name);
#elif defined (G_OS_UNIX)
if (g_file_get_contents ("/etc/os-release", &contents, NULL, NULL) ||
g_file_get_contents ("/usr/lib/os-release", &contents, NULL, NULL))
g_assert_nonnull (name);
g_test_skip ("os-release(5) API not implemented on this platform");
g_test_skip ("g_get_os_info() not supported on this platform");
g_free (name);
g_free (contents);
static gboolean
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment