Merge branch '501-test-subprocess-fds' into 'master'

gtestutils: pass open file descriptors to subprocess

See merge request GNOME/glib!595
This commit is contained in:
Philip Withnall 2019-01-18 15:11:42 +00:00
commit 1a73410a96

View File

@ -3431,6 +3431,8 @@ g_test_trap_subprocess (const char *test_path,
g_ptr_array_add (argv, NULL);
flags = G_SPAWN_DO_NOT_REAP_CHILD;
if (test_log_fd != -1)
flags |= G_SPAWN_LEAVE_DESCRIPTORS_OPEN;
if (test_flags & G_TEST_TRAP_INHERIT_STDIN)
flags |= G_SPAWN_CHILD_INHERITS_STDIN;