proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-07-27 09:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fwupdplugin-self-test: fix spawn tests for qemu

Browse Source 
Wrap the spawned script with an explicit call to the /bin/sh
interpreter needed when running tests in a cross compiled enviroment.

Also increase the timeout for the spawned script to execute to give
enough time for the print to happen in the much slower virtualized
environment.

Change-Id: I71ed377e1bc8db4be4c522cdb9562c1662df7266
This commit is contained in:
Daniel Campello 2022-03-09 14:03:44 -07:00 committed by Daniel Campello
parent 91512925a0
commit 61226b49f3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libfwupdplugin/fu-self-test.c
View File

@ -1017,7 +1017,7 @@ fu_common_spawn_func(void)
guint lines = 0;
g_autoptr(GError) error = NULL;
g_autofree gchar *fn = NULL;
const gchar *argv[3] = {"replace", "test", NULL};
const gchar *argv[4] = {"/bin/sh", "replace", "test", NULL};
#ifdef _WIN32
g_test_skip("Known failures on Windows right now, skipping spawn func test");
@ -1025,7 +1025,7 @@ fu_common_spawn_func(void)
#endif
fn = g_test_build_filename(G_TEST_DIST, "tests", "spawn.sh", NULL);
argv[0] = fn;
argv[1] = fn;
ret = fu_common_spawn_sync(argv, fu_test_stdout_cb, &lines, 0, NULL, &error);
g_assert_no_error(error);
g_assert_true(ret);
@ -1039,7 +1039,7 @@ fu_common_spawn_timeout_func(void)
guint lines = 0;
g_autoptr(GError) error = NULL;
g_autofree gchar *fn = NULL;
const gchar *argv[3] = {"replace", "test", NULL};
const gchar *argv[4] = {"/bin/sh", "replace", "test", NULL};
#ifdef _WIN32
g_test_skip("Known failures on Windows right now, skipping spawn timeout test");
@ -1047,8 +1047,8 @@ fu_common_spawn_timeout_func(void)
#endif
fn = g_test_build_filename(G_TEST_DIST, "tests", "spawn.sh", NULL);
argv[0] = fn;
ret = fu_common_spawn_sync(argv, fu_test_stdout_cb, &lines, 50, NULL, &error);
argv[1] = fn;
ret = fu_common_spawn_sync(argv, fu_test_stdout_cb, &lines, 500, NULL, &error);
g_assert_error(error, G_IO_ERROR, G_IO_ERROR_CANCELLED);
g_assert_false(ret);
g_assert_cmpint(lines, ==, 1);