luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 05:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: Don't fail when not using du from GNU coreutils

Browse Source 
The test 'file' uses non-standard '--bytes' option when running du,
which may cause error on non-GNU systems. To keep the test working,
we skips the du check as if we don't find a du command when du fails.
This commit is contained in:
Ting-Wei Lan 2018-05-26 15:52:16 +08:00
parent b4259dec70
commit bfbeb6f0f5
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gio/tests/file.c
View File

@ -897,13 +897,13 @@ splice_to_string (GInputStream *stream,
return ret; return ret;
} }
static guint64 static gboolean
get_size_from_du (const gchar *path) get_size_from_du (const gchar *path, guint64 *size)
{ {
GSubprocess *du; GSubprocess *du;
gboolean ok;
gchar *result; gchar *result;
gchar *endptr; gchar *endptr;
guint64 size;
GError *error = NULL; GError *error = NULL;
du = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_PIPE, du = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_PIPE,
@ -914,12 +914,17 @@ get_size_from_du (const gchar *path)
result = splice_to_string (g_subprocess_get_stdout_pipe (du), &error); result = splice_to_string (g_subprocess_get_stdout_pipe (du), &error);
g_assert_no_error (error); g_assert_no_error (error);
size = g_ascii_strtoll (result, &endptr, 10); *size = g_ascii_strtoll (result, &endptr, 10);
g_subprocess_wait (du, NULL, &error);
g_assert_no_error (error);
ok = g_subprocess_get_successful (du);
g_object_unref (du); g_object_unref (du);
g_free (result); g_free (result);
return size; return ok;
} }
static void static void
@ -937,13 +942,9 @@ test_measure (void)
path = g_test_build_filename (G_TEST_DIST, "desktop-files", NULL); path = g_test_build_filename (G_TEST_DIST, "desktop-files", NULL);
file = g_file_new_for_path (path); file = g_file_new_for_path (path);
if (g_find_program_in_path ("du")) if (!g_find_program_in_path ("du") || !get_size_from_du (path, &size))
{ {
size = get_size_from_du (path); g_test_message ("du not found or fail to run, skipping byte measurement");
}
else
{
g_test_message ("du not found, skipping byte measurement");
size = 0; size = 0;
} }
@ -1043,13 +1044,10 @@ test_measure_async (void)
path = g_test_build_filename (G_TEST_DIST, "desktop-files", NULL); path = g_test_build_filename (G_TEST_DIST, "desktop-files", NULL);
file = g_file_new_for_path (path); file = g_file_new_for_path (path);
if (g_find_program_in_path ("du")) if (!g_find_program_in_path ("du") ||
!get_size_from_du (path, &data->expected_bytes))
{ {
data->expected_bytes = get_size_from_du (path); g_test_message ("du not found or fail to run, skipping byte measurement");
}
else
{
g_test_message ("du not found, skipping byte measurement");
data->expected_bytes = 0; data->expected_bytes = 0;
} }