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

Merge branch 'wip/smcv/defer-test-cleanup' into 'main'

Browse Source 
testutils: Defer global cleanup until we really exit

Closes #2563

See merge request GNOME/glib!2420
This commit is contained in:
Philip Withnall
2022-02-11 14:21:43 +00:00
parent 6fd53df562 f2d67f3605
commit 1094bfc7d7
2 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
glib/tests/testing.c
View File

@@ -1589,12 +1589,19 @@ int
main (int argc,
char *argv[])
{
int ret;
char *filename, *filename2;
argv0 = argv[0];
setlocale (LC_ALL, "");
g_test_init (&argc, &argv, NULL);
/* Part of a test for
* https://gitlab.gnome.org/GNOME/glib/-/issues/2563, see below */
filename = g_test_build_filename (G_TEST_BUILT, "nonexistent", NULL);
g_test_add_func ("/random-generator/rand-1", test_rand1);
g_test_add_func ("/random-generator/rand-2", test_rand2);
g_test_add_func ("/random-generator/random-conversions", test_random_conversions);
@@ -1675,5 +1682,16 @@ main (int argc,
g_test_add_func ("/tap", test_tap);
g_test_add_func ("/tap/summary", test_tap_summary);
return g_test_run();
ret = g_test_run ();
/* We can't test for https://gitlab.gnome.org/GNOME/glib/-/issues/2563
* from a test-case, because the whole point of that issue is that it's
* about whether certain patterns are valid after g_test_run() has
* returned... so put an ad-hoc test here, and just crash if it fails. */
filename2 = g_test_build_filename (G_TEST_BUILT, "nonexistent", NULL);
g_assert_cmpstr (filename, ==, filename2);
g_free (filename);
g_free (filename2);
return ret;
}