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

gtestutils: reorganize g_test_name manipulation

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=754284
This commit is contained in:
Dan Winship 2014-03-14 11:41:44 -04:00
parent 34ec21fab5
commit 510331bacf
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
glib/gtestutils.c
View File

@ -2069,14 +2069,13 @@ g_test_queue_destroy (GDestroyNotify destroy_func,
static gboolean static gboolean
test_case_run (GTestCase *tc) test_case_run (GTestCase *tc)
{ {
gchar *old_name = test_run_name, *old_base = g_strdup (test_uri_base); gchar *old_base = g_strdup (test_uri_base);
GSList **old_free_list, *filename_free_list = NULL; GSList **old_free_list, *filename_free_list = NULL;
gboolean success = G_TEST_RUN_SUCCESS; gboolean success = G_TEST_RUN_SUCCESS;
old_free_list = test_filename_free_list; old_free_list = test_filename_free_list;
test_filename_free_list = &filename_free_list; test_filename_free_list = &filename_free_list;
test_run_name = g_strconcat (old_name, "/", tc->name, NULL);
if (strstr (test_run_name, "/subprocess")) if (strstr (test_run_name, "/subprocess"))
{ {
GSList *iter; GSList *iter;
@ -2148,8 +2147,6 @@ test_case_run (GTestCase *tc)
out: out:
g_slist_free_full (filename_free_list, g_free); g_slist_free_full (filename_free_list, g_free);
test_filename_free_list = old_free_list; test_filename_free_list = old_free_list;
g_free (test_run_name);
test_run_name = old_name;
g_free (test_uri_base); g_free (test_uri_base);
test_uri_base = old_base; test_uri_base = old_base;
@ -2174,7 +2171,6 @@ g_test_run_suite_internal (GTestSuite *suite,
l = strlen (path); l = strlen (path);
rest = strchr (path, '/'); rest = strchr (path, '/');
l = rest ? MIN (l, rest - path) : l; l = rest ? MIN (l, rest - path) : l;
test_run_name = suite->name[0] == 0 ? g_strdup (test_run_name) : g_strconcat (old_name, "/", suite->name, NULL);
reversed = g_slist_reverse (g_slist_copy (suite->cases)); reversed = g_slist_reverse (g_slist_copy (suite->cases));
for (slist = reversed; slist; slist = slist->next) for (slist = reversed; slist; slist = slist->next)
{ {
@ -2182,8 +2178,10 @@ g_test_run_suite_internal (GTestSuite *suite,
guint n = l ? strlen (tc->name) : 0; guint n = l ? strlen (tc->name) : 0;
if (l == n && !rest && strncmp (path, tc->name, n) == 0) if (l == n && !rest && strncmp (path, tc->name, n) == 0)
{ {
test_run_name = g_build_path ("/", old_name, tc->name, NULL);
if (!test_case_run (tc)) if (!test_case_run (tc))
n_bad++; n_bad++;
g_free (test_run_name);
} }
} }
g_slist_free (reversed); g_slist_free (reversed);
@ -2193,10 +2191,13 @@ g_test_run_suite_internal (GTestSuite *suite,
GTestSuite *ts = slist->data; GTestSuite *ts = slist->data;
guint n = l ? strlen (ts->name) : 0; guint n = l ? strlen (ts->name) : 0;
if (l == n && strncmp (path, ts->name, n) == 0) if (l == n && strncmp (path, ts->name, n) == 0)
n_bad += g_test_run_suite_internal (ts, rest ? rest : ""); {
test_run_name = g_build_path ("/", old_name, ts->name, NULL);
n_bad += g_test_run_suite_internal (ts, rest ? rest : "");
g_free (test_run_name);
}
} }
g_slist_free (reversed); g_slist_free (reversed);
g_free (test_run_name);
test_run_name = old_name; test_run_name = old_name;
g_test_log (G_TEST_LOG_STOP_SUITE, suite->name, NULL, 0, NULL); g_test_log (G_TEST_LOG_STOP_SUITE, suite->name, NULL, 0, NULL);
@ -2232,6 +2233,8 @@ g_test_run_suite (GTestSuite *suite)
g_test_run_once = FALSE; g_test_run_once = FALSE;
test_run_name = g_strdup_printf ("/%s", suite->name);
if (test_paths) if (test_paths)
my_test_paths = g_slist_copy (test_paths); my_test_paths = g_slist_copy (test_paths);
else else
@ -2257,6 +2260,9 @@ g_test_run_suite (GTestSuite *suite)
n_bad += g_test_run_suite_internal (suite, rest ? rest : ""); n_bad += g_test_run_suite_internal (suite, rest ? rest : "");
} }
g_free (test_run_name);
test_run_name = NULL;
return n_bad; return n_bad;
} }