luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-11-29 13:29:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

gtestutils: Add new G_TEST_SUBPROCESS_INHERIT_DESCRIPTORS flag

Browse Source
This commit is contained in:
Luca Bacci
2025-11-14 18:33:42 +01:00
parent ef0edb01ad
commit e37fb2a398
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glib/gtestutils.c
View File

@@ -205,6 +205,8 @@
* process will inherit the parent's stderr. Otherwise, the child's
* stderr will not be visible, but it will be captured to allow
* later tests with [func@GLib.test_trap_assert_stderr].
* @G_TEST_SUBPROCESS_INHERIT_DESCRIPTORS: If this flag is given, the
* child process will inherit the parent’s open file descriptors.
*
* Flags to pass to [func@GLib.test_trap_subprocess] to control input and output.
*
@@ -4175,7 +4177,7 @@ g_test_trap_subprocess_with_envp (const char *test_path,
g_ptr_array_add (argv, NULL);
flags = G_SPAWN_DO_NOT_REAP_CHILD;
if (test_log_fd != -1)
if ((test_flags & G_TEST_SUBPROCESS_INHERIT_DESCRIPTORS) || test_log_fd != -1)
flags |= G_SPAWN_LEAVE_DESCRIPTORS_OPEN;
if (test_flags & G_TEST_SUBPROCESS_INHERIT_STDIN)
flags |= G_SPAWN_CHILD_INHERITS_STDIN;

3
glib/gtestutils.h
View File

@@ -540,7 +540,8 @@ typedef enum {
G_TEST_SUBPROCESS_DEFAULT GLIB_AVAILABLE_ENUMERATOR_IN_2_74 = 0,
G_TEST_SUBPROCESS_INHERIT_STDIN = 1 << 0,
G_TEST_SUBPROCESS_INHERIT_STDOUT = 1 << 1,
G_TEST_SUBPROCESS_INHERIT_STDERR = 1 << 2
G_TEST_SUBPROCESS_INHERIT_STDERR = 1 << 2,
G_TEST_SUBPROCESS_INHERIT_DESCRIPTORS GLIB_AVAILABLE_ENUMERATOR_IN_2_88 = 1 << 3,
} G_GNUC_FLAG_ENUM GTestSubprocessFlags;
GLIB_AVAILABLE_IN_2_38