From aaae515e133656e55490ecb4cedd7b02f62b1df2 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 28 Oct 2022 11:23:55 -0400 Subject: [PATCH] Revert "gstdio: Temporarily disable g_close() warning on macOS" This reverts commit 5190354ad95c5a10fdde037de8177797ae4a7384. Now that g_close isn't called from gspawn anymore, we can reenable the g_close warning on macOS. Closes: #2785 --- glib/gstdio.c | 6 ------ glib/tests/spawn-test.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/glib/gstdio.c b/glib/gstdio.c index 3bc96e9ed..c0d5e334d 100644 --- a/glib/gstdio.c +++ b/glib/gstdio.c @@ -1816,13 +1816,7 @@ g_close (gint fd, * not necessarily in the caller of g_close(), but somebody else * might have wrongly closed fd. In any case, there is a serious bug * somewhere. */ - /* FIXME: This causes a number of unit test failures on macOS. - * Disabling the message for now until someone with access to a - * macOS machine can investigate. - * See https://gitlab.gnome.org/GNOME/glib/-/issues/2785 */ -#ifndef G_OS_DARWIN g_critical ("g_close(fd:%d) failed with EBADF. The tracking of file descriptors got messed up", fd); -#endif } else { diff --git a/glib/tests/spawn-test.c b/glib/tests/spawn-test.c index 5a5fcaf70..2e39aca8c 100644 --- a/glib/tests/spawn-test.c +++ b/glib/tests/spawn-test.c @@ -225,7 +225,7 @@ test_spawn_stdio_overwrite (void) char **envp = g_get_environ (); enum OpenState { OPENED = 0, CLOSED = 1, DONE = 2 } stdin_state, stdout_state, stderr_state, output_return_state, error_return_state; - g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2055"); + g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/16"); old_stdin_fd = dup (STDIN_FILENO); old_stdout_fd = dup (STDOUT_FILENO);