Merge branch 'test-F_DUPFD_CLOEXEC' into 'master'

glib spawn-singlethread test only if F_DUPFD_CLOEXEC is defined

See merge request GNOME/glib!2108
This commit is contained in:
Philip Withnall 2021-05-14 18:51:49 +00:00
commit c3b11c64ee

View File

@ -433,7 +433,7 @@ test_spawn_nonexistent (void)
static void static void
test_spawn_fd_assignment_clash (void) test_spawn_fd_assignment_clash (void)
{ {
#ifdef G_OS_UNIX #if defined(G_OS_UNIX) && defined(F_DUPFD_CLOEXEC)
int tmp_fd; int tmp_fd;
guint i; guint i;
const guint n_fds = 10; const guint n_fds = 10;
@ -487,7 +487,7 @@ test_spawn_fd_assignment_clash (void)
for (i = 0; i < n_fds; i++) for (i = 0; i < n_fds; i++)
g_close (source_fds[i], NULL); g_close (source_fds[i], NULL);
#else /* !G_OS_UNIX */ #else /* !G_OS_UNIX */
g_test_skip ("FD redirection only supported on Unix"); g_test_skip ("FD redirection only supported on Unix with F_DUPFD_CLOEXEC");
#endif /* !G_OS_UNIX */ #endif /* !G_OS_UNIX */
} }