luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-30 20:33:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

g_test_run: Introduce a clean up path once test suite ran

Browse Source
This commit is contained in:
GOUJON Évan 2021-07-23 22:05:52 +02:00
parent 950bbe7984
commit 0786031804
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
glib/gtestutils.c
View File

@ -2178,8 +2178,15 @@ g_test_get_root (void)
int int
g_test_run (void) g_test_run (void)
{ {
if (g_test_run_suite (g_test_get_root()) != 0) int ret;
return 1; GTestSuite *suite;
suite = g_test_get_root ();
if (g_test_run_suite (suite) != 0)
{
ret = 1;
goto out;
}
/* Clean up the temporary directory. */ /* Clean up the temporary directory. */
if (test_isolate_dirs_tmpdir != NULL) if (test_isolate_dirs_tmpdir != NULL)
@ -2192,12 +2199,24 @@ g_test_run (void)
/* 77 is special to Automake's default driver, but not Automake's TAP driver /* 77 is special to Automake's default driver, but not Automake's TAP driver
* or Perl's prove(1) TAP driver. */ * or Perl's prove(1) TAP driver. */
if (test_tap_log) if (test_tap_log)
return 0; {
ret = 0;
goto out;
}
if (test_run_count > 0 && test_run_count == test_skipped_count) if (test_run_count > 0 && test_run_count == test_skipped_count)
return 77; {
ret = 77;
goto out;
}
else else
return 0; {
ret = 0;
goto out;
}
out:
return ret;
} }
/** /**