From 1dd11faaea454e99624fb52314b2c34e29a75ba3 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 3 Nov 2022 20:39:37 +0000 Subject: [PATCH] fileutils test: Use no-op invalid-parameter handler when exercising EBADF This is basically !3036, but wasn't included there because !3036 and !3027 were developed in parallel. Signed-off-by: Simon McVittie --- glib/tests/fileutils.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/glib/tests/fileutils.c b/glib/tests/fileutils.c index 35536fd95..8ca25f9cc 100644 --- a/glib/tests/fileutils.c +++ b/glib/tests/fileutils.c @@ -2485,12 +2485,14 @@ test_clear_fd_ebadf (void) int copy_of_fd; int errsv; gboolean ret; + GWin32InvalidParameterHandler handler; /* We're going to trigger a programming error: attmpting to close a * fd that was already closed. Make criticals non-fatal. */ g_assert_true (g_test_undefined ()); g_log_set_always_fatal (G_LOG_FATAL_MASK); g_log_set_fatal_mask ("GLib", G_LOG_FATAL_MASK); + GLIB_PRIVATE_CALL (g_win32_push_empty_invalid_parameter_handler) (&handler); fd = g_file_open_tmp (NULL, &name, &error); g_assert_cmpint (fd, !=, -1); @@ -2532,6 +2534,8 @@ test_clear_fd_ebadf (void) errsv = errno; g_assert_cmpint (errsv, ==, EILSEQ); #endif + + GLIB_PRIVATE_CALL (g_win32_pop_invalid_parameter_handler) (&handler); } static void