luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-21 14:49:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'test-timing' into 'main'

Browse Source 
gtestutils: print timing information per test case in TAP output

See merge request GNOME/glib!3420
This commit is contained in:
Philip Withnall 2023-06-01 10:48:15 +00:00
commit 10fb2db8f7
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
glib/gtestutils.c
View File

@ -926,6 +926,14 @@ const GTestConfig * const g_test_config_vars = &mutable_test_config_vars;
static gboolean no_g_set_prgname = FALSE; static gboolean no_g_set_prgname = FALSE;
static GPrintFunc g_default_print_func = NULL; static GPrintFunc g_default_print_func = NULL;
enum
{
G_TEST_CASE_LARGS_RESULT = 0,
G_TEST_CASE_LARGS_RUN_FORKS = 1,
G_TEST_CASE_LARGS_EXECUTION_TIME = 2,
G_TEST_CASE_LARGS_MAX
};
/* --- functions --- */ /* --- functions --- */
static inline gboolean static inline gboolean
@ -1089,6 +1097,7 @@ g_test_log (GTestLogType lbit,
guint8 *dbuffer; guint8 *dbuffer;
guint32 dbufferlen; guint32 dbufferlen;
unsigned subtest_level; unsigned subtest_level;
gdouble timing;
if (g_once_init_enter (&g_default_print_func)) if (g_once_init_enter (&g_default_print_func))
{ {
@ -1145,7 +1154,8 @@ g_test_log (GTestLogType lbit,
} }
break; break;
case G_TEST_LOG_STOP_CASE: case G_TEST_LOG_STOP_CASE:
result = largs[0]; result = largs[G_TEST_CASE_LARGS_RESULT];
timing = largs[G_TEST_CASE_LARGS_EXECUTION_TIME];
fail = result == G_TEST_RUN_FAILURE; fail = result == G_TEST_RUN_FAILURE;
if (test_tap_log) if (test_tap_log)
{ {
@ -1176,6 +1186,16 @@ g_test_log (GTestLogType lbit,
g_string_append_c (tap_output, '\n'); g_string_append_c (tap_output, '\n');
g_default_print_func (tap_output->str); g_default_print_func (tap_output->str);
g_string_free (g_steal_pointer (&tap_output), TRUE); g_string_free (g_steal_pointer (&tap_output), TRUE);
/* Print msg for any slow tests, where 'slow' means >= 0.5 secs */
if (timing > 0.5)
{
tap_output = g_string_new ("# ");
g_string_append_printf (tap_output, "slow test %s executed in %0.2lf secs\n",
string1, timing);
g_default_print_func (tap_output->str);
g_string_free (g_steal_pointer (&tap_output), TRUE);
}
} }
else if (g_test_verbose ()) else if (g_test_verbose ())
g_print ("GTest: result: %s\n", g_test_result_names[result]); g_print ("GTest: result: %s\n", g_test_result_names[result]);
@ -3086,7 +3106,7 @@ test_case_run (GTestCase *tc)
else else
{ {
GTimer *test_run_timer = g_timer_new(); GTimer *test_run_timer = g_timer_new();
long double largs[3]; long double largs[G_TEST_CASE_LARGS_MAX];
void *fixture; void *fixture;
g_test_log (G_TEST_LOG_START_CASE, test_run_name, NULL, 0, NULL); g_test_log (G_TEST_LOG_START_CASE, test_run_name, NULL, 0, NULL);
test_run_forks = 0; test_run_forks = 0;
@ -3132,9 +3152,9 @@ test_case_run (GTestCase *tc)
} }
success = test_run_success; success = test_run_success;
test_run_success = G_TEST_RUN_FAILURE; test_run_success = G_TEST_RUN_FAILURE;
largs[0] = success; /* OK */ largs[G_TEST_CASE_LARGS_RESULT] = success; /* OK */
largs[1] = test_run_forks; largs[G_TEST_CASE_LARGS_RUN_FORKS] = test_run_forks;
largs[2] = g_timer_elapsed (test_run_timer, NULL); largs[G_TEST_CASE_LARGS_EXECUTION_TIME] = g_timer_elapsed (test_run_timer, NULL);
g_test_log (G_TEST_LOG_STOP_CASE, test_run_name, test_run_msg, G_N_ELEMENTS (largs), largs); g_test_log (G_TEST_LOG_STOP_CASE, test_run_name, test_run_msg, G_N_ELEMENTS (largs), largs);
g_clear_pointer (&test_run_msg, g_free); g_clear_pointer (&test_run_msg, g_free);
g_timer_destroy (test_run_timer); g_timer_destroy (test_run_timer);