luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add a test-case for calling g_test_build_filename after g_test_run

Browse Source 
This will not reproduce the bug when run as a unit test, because in that
scenario, G_TEST_BUILDDIR and G_TEST_SRCDIR are set. It *can* reproduce
the bug (at least probabilistically) when run as an installed-test,
or manually in a build tree:

    ./_build/glib/tests/testing

Reproduces: 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:09:31 +00:00 committed by Philip Withnall
parent c651ea0453
commit 00b17c92bf
1 changed files with 19 additions and 1 deletions
Show Stats 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;
}