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

gtestutils: rename test_skip_count to test_startup_skip_count

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=720263
This commit is contained in:
Dan Winship 2013-12-18 09:29:29 -05:00
parent 8c188fc9e5
commit 10d82f9775
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
glib/gtestutils.c
View File

@ -609,7 +609,7 @@ static guint test_run_forks = 0;
static guint test_run_count = 0; static guint test_run_count = 0;
static GTestResult test_run_success = G_TEST_RUN_FAILURE; static GTestResult test_run_success = G_TEST_RUN_FAILURE;
static gchar *test_run_msg = NULL; static gchar *test_run_msg = NULL;
static guint test_skip_count = 0; static guint test_startup_skip_count = 0;
static GTimer *test_user_timer = NULL; static GTimer *test_user_timer = NULL;
static double test_user_stamp = 0; static double test_user_stamp = 0;
static GSList *test_paths = NULL; static GSList *test_paths = NULL;
@ -869,11 +869,11 @@ parse_args (gint *argc_p,
{ {
gchar *equal = argv[i] + 16; gchar *equal = argv[i] + 16;
if (*equal == '=') if (*equal == '=')
test_skip_count = g_ascii_strtoull (equal + 1, NULL, 0); test_startup_skip_count = g_ascii_strtoull (equal + 1, NULL, 0);
else if (i + 1 < argc) else if (i + 1 < argc)
{ {
argv[i++] = NULL; argv[i++] = NULL;
test_skip_count = g_ascii_strtoull (argv[i], NULL, 0); test_startup_skip_count = g_ascii_strtoull (argv[i], NULL, 0);
} }
argv[i] = NULL; argv[i] = NULL;
} }
@ -2063,7 +2063,7 @@ test_case_run (GTestCase *tc)
} }
} }
if (++test_run_count <= test_skip_count) if (++test_run_count <= test_startup_skip_count)
g_test_log (G_TEST_LOG_SKIP_CASE, test_run_name, NULL, 0, NULL); g_test_log (G_TEST_LOG_SKIP_CASE, test_run_name, NULL, 0, NULL);
else if (test_run_list) else if (test_run_list)
{ {