luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-28 05:02:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

testutils: Defer global cleanup until we really exit

Browse Source 
Some test suites try to call g_test_build_filename() after g_test_run()
has returned. In the installed-tests use-case where G_TEST_BUILDDIR and
G_TEST_SRCDIR are unset, that call uses test_argv0_dirname, which
is freed in test_cleanup(). Defer test_cleanup() using atexit() so it
isn't freed until after we return from main().

Resolves: https://gitlab.gnome.org/GNOME/glib/-/issues/2563
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2022-01-06 15:41:08 +00:00
parent 2c958470d2
commit c651ea0453
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glib/gtestutils.c
View File

@ -890,10 +890,10 @@ static gboolean test_debug_log = FALSE;
static gboolean test_tap_log = TRUE; /* default to TAP as of GLib 2.62; see #1619; the non-TAP output mode is deprecated */ static gboolean test_tap_log = TRUE; /* default to TAP as of GLib 2.62; see #1619; the non-TAP output mode is deprecated */
static gboolean test_nonfatal_assertions = FALSE; static gboolean test_nonfatal_assertions = FALSE;
static DestroyEntry *test_destroy_queue = NULL; static DestroyEntry *test_destroy_queue = NULL;
static char *test_argv0 = NULL; static char *test_argv0 = NULL; /* points into global argv */
static char *test_argv0_dirname; static char *test_argv0_dirname = NULL; /* owned by GLib */
static const char *test_disted_files_dir; static const char *test_disted_files_dir; /* points into test_argv0_dirname or an environment variable */
static const char *test_built_files_dir; static const char *test_built_files_dir; /* points into test_argv0_dirname or an environment variable */
static char *test_initial_cwd = NULL; static char *test_initial_cwd = NULL;
static gboolean test_in_forked_child = FALSE; static gboolean test_in_forked_child = FALSE;
static gboolean test_in_subprocess = FALSE; static gboolean test_in_subprocess = FALSE;
@ -2219,6 +2219,13 @@ g_test_run (void)
int ret; int ret;
GTestSuite *suite; GTestSuite *suite;
if (atexit (test_cleanup) != 0)
{
int errsv = errno;
g_error ("Unable to register test cleanup to be run at exit: %s",
g_strerror (errsv));
}
suite = g_test_get_root (); suite = g_test_get_root ();
if (g_test_run_suite (suite) != 0) if (g_test_run_suite (suite) != 0)
{ {
@ -2255,7 +2262,6 @@ g_test_run (void)
out: out:
g_test_suite_free (suite); g_test_suite_free (suite);
test_cleanup ();
return ret; return ret;
} }