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

gtestutils: print the TAP test plan first, not last

Browse Source 
TAP allows you to print the "test plan" (ie, the expected number of
tests" either at the start or the end of the test program, but if you
put it at the end, and the program crashes, automake will complain
"missing test plan", which is confusing to users (particularly since
it prints that *before* it prints that the test program crashed,
suggesting that somehow the lack of test plan was responsible for the
crash or something, rather than vice versa).

Anyway, change it to count the tests ahead of time, and print the test
plan first. Keeping this simple requires disallowing the '-p', '-s',
and '--GTestSkipCount' options when using '--tap' (although we were
already printing the wrong number in the --GTestSkipCount case
anyway).

https://bugzilla.gnome.org/show_bug.cgi?id=754284
This commit is contained in:
Dan Winship 2014-12-12 11:49:31 -05:00
parent 51c91ed53d
commit 6e382208f7
1 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
glib/gtestutils.c
View File

@ -657,6 +657,7 @@ static gchar *test_run_name = "";
static GSList **test_filename_free_list;
static guint test_run_forks = 0;
static guint test_run_count = 0;
static guint test_count = 0;
static guint test_skipped_count = 0;
static GTestResult test_run_success = G_TEST_RUN_FAILURE;
static gchar *test_run_msg = NULL;
@ -783,6 +784,8 @@ g_test_log (GTestLogType lbit,
{
if (string1[0] != 0)
g_print ("# Start of %s tests\n", string1);
else
g_print ("1..%d\n", test_count);
}
break;
case G_TEST_LOG_STOP_SUITE:
@ -790,8 +793,6 @@ g_test_log (GTestLogType lbit,
{
if (string1[0] != 0)
g_print ("# End of %s tests\n", string1);
else
g_print ("1..%d\n", test_run_count);
}
break;
case G_TEST_LOG_STOP_CASE:
@ -1142,6 +1143,17 @@ g_test_init (int *argc,
if (!g_get_prgname() && !no_g_set_prgname)
g_set_prgname ((*argv)[0]);
/* sanity check */
if (test_tap_log)
{
if (test_paths || test_paths_skipped || test_startup_skip_count)
{
g_printerr ("%s: options that skip some tests are incompatible with --tap\n",
(*argv)[0]);
exit (1);
}
}
/* verify GRand reliability, needed for reliable seeds */
if (1)
{
@ -2204,6 +2216,33 @@ g_test_run_suite_internal (GTestSuite *suite,
return n_bad;
}
static int
g_test_suite_count (GTestSuite *suite)
{
int n = 0;
GSList *iter;
g_return_val_if_fail (suite != NULL, -1);
for (iter = suite->cases; iter; iter = iter->next)
{
GTestCase *tc = iter->data;
if (strcmp (tc->name, "subprocess") != 0)
n++;
}
for (iter = suite->suites; iter; iter = iter->next)
{
GTestSuite *ts = iter->data;
if (strcmp (ts->name, "subprocess") != 0)
n += g_test_suite_count (ts);
}
return n;
}
/**
* g_test_run_suite:
* @suite: a #GTestSuite
@ -2229,6 +2268,7 @@ g_test_run_suite (GTestSuite *suite)
g_return_val_if_fail (g_test_run_once == TRUE, -1);
g_test_run_once = FALSE;
test_count = g_test_suite_count (suite);
test_run_name = g_strdup_printf ("/%s", suite->name);