diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2023-08-14 09:08:19 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2023-08-14 09:08:19 +0000 |
| commit | 11d051f36ec6cef6ccf27ebccb0ff2ee11aa88c4 (patch) | |
| tree | 446a48c83f27d589a67d15652ad5701958a198e1 | |
| parent | da47d030d4a6ce30de8df734ae09c8da89e0871c (diff) | |
| parent | 065069191cae60edb076eb71624ec7cf5b78153e (diff) | |
| download | glib-11d051f36ec6cef6ccf27ebccb0ff2ee11aa88c4.tar.gz | |
Merge branch 'wip/pwithnall/fix-ptrace' into 'main'
tests: Disable use of ptrace() in tests on BSD and macOS
See merge request GNOME/glib!3532
| -rw-r--r-- | gio/tests/gsubprocess.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/gio/tests/gsubprocess.c b/gio/tests/gsubprocess.c index c7f2ea489..695012c7d 100644 --- a/gio/tests/gsubprocess.c +++ b/gio/tests/gsubprocess.c @@ -2,7 +2,6 @@ #include <string.h> #ifdef G_OS_UNIX -#include <sys/ptrace.h> #include <sys/wait.h> #include <glib-unix.h> #include <gio/gunixinputstream.h> @@ -12,6 +11,10 @@ #include <fcntl.h> #endif +#ifdef __linux__ +#include <sys/ptrace.h> +#endif + /* We write 2^1 + 2^2 ... + 2^10 or 2047 copies of "Hello World!\n" * ultimately */ @@ -1990,6 +1993,8 @@ test_fd_conflation_child_err_report_fd (void) do_test_fd_conflation (G_SUBPROCESS_FLAGS_NONE, empty_child_setup, TRUE); } +#ifdef __linux__ + /* Handle ptrace events on @main_child, and assert that when it exits, it does * so with status %EXIT_SUCCESS, rather than signalling. Other than that, this * just calls %PTRACE_CONT for all trace events. */ @@ -2061,15 +2066,20 @@ trace_children (pid_t main_child) } } +#endif /* __linux__ */ + static void test_exit_status_trapped (void) { +#ifdef __linux__ GPtrArray *args = NULL; pid_t test_child; +#endif g_test_summary ("Test that exit status is reported correctly for ptrace()d child processes"); g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3433"); +#ifdef __linux__ /* Call fork() directly here, rather than using #GSubprocess, so that we can * safely call waitpid() on it ourselves without interfering with the internals * of #GSubprocess. @@ -2088,6 +2098,9 @@ test_exit_status_trapped (void) trace_children (test_child); g_clear_pointer (&args, g_ptr_array_unref); +#else + g_test_skip ("ptrace() support for this test is only tested on Linux"); +#endif } #endif /* G_OS_UNIX */ |