mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-12-24 22:46:15 +01:00
gtestframework.c: fixed testpath matches for automatic root suite.
svn path=/trunk/; revision=5896
This commit is contained in:
parent
d0709d04cb
commit
a7dc2ea272
@ -677,15 +677,20 @@ g_test_run_suite (GTestSuite *suite)
|
|||||||
while (test_paths)
|
while (test_paths)
|
||||||
{
|
{
|
||||||
const char *rest, *path = test_paths->data;
|
const char *rest, *path = test_paths->data;
|
||||||
guint l, n;
|
guint l, n = strlen (suite->name);
|
||||||
test_paths = g_slist_delete_link (test_paths, test_paths);
|
test_paths = g_slist_delete_link (test_paths, test_paths);
|
||||||
while (path[0] == '/')
|
while (path[0] == '/')
|
||||||
path++;
|
path++;
|
||||||
|
if (!n) /* root suite, run unconditionally */
|
||||||
|
{
|
||||||
|
n_bad += 0 != g_test_run_suite_internal (suite, path);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
/* regular suite, match path */
|
||||||
rest = strchr (path, '/');
|
rest = strchr (path, '/');
|
||||||
l = strlen (path);
|
l = strlen (path);
|
||||||
l = rest ? MIN (l, rest - path) : l;
|
l = rest ? MIN (l, rest - path) : l;
|
||||||
n = l ? strlen (suite->name) : 0;
|
if (!l || l == n && strncmp (path, suite->name, n) == 0)
|
||||||
if (l == n && strncmp (path, suite->name, n) == 0)
|
|
||||||
n_bad += 0 != g_test_run_suite_internal (suite, rest ? rest : "");
|
n_bad += 0 != g_test_run_suite_internal (suite, rest ? rest : "");
|
||||||
}
|
}
|
||||||
return n_bad;
|
return n_bad;
|
||||||
|
Loading…
Reference in New Issue
Block a user