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

Add a GTestResult enumeration

Browse Source 
This enumeration will be expanded to introduce more results
in the following commits.

https://bugzilla.gnome.org/show_bug.cgi?id=692125
This commit is contained in:
Matthias Clasen 2013-08-17 14:04:58 -04:00
parent 8253f98a18
commit 4e6d25f005
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
glib/gtestutils.c
View File

@ -537,6 +537,11 @@ static void gtest_default_log_handler (const gchar *log_domain,
gpointer unused_data); gpointer unused_data);
typedef enum {
G_TEST_RUN_SUCCESS,
G_TEST_RUN_FAILURE
} GTestResult;
/* --- variables --- */ /* --- variables --- */
static int test_log_fd = -1; static int test_log_fd = -1;
static gboolean test_mode_fatal = TRUE; static gboolean test_mode_fatal = TRUE;
@ -548,7 +553,7 @@ static gchar *test_run_name = "";
static GSList **test_filename_free_list; static GSList **test_filename_free_list;
static guint test_run_forks = 0; static guint test_run_forks = 0;
static guint test_run_count = 0; static guint test_run_count = 0;
static guint test_run_success = FALSE; static GTestResult test_run_success = G_TEST_RUN_FAILURE;
static guint test_skip_count = 0; static guint test_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;
@ -1572,7 +1577,7 @@ g_test_add_vtable (const char *testpath,
void void
g_test_fail (void) g_test_fail (void)
{ {
test_run_success = FALSE; test_run_success = G_TEST_RUN_FAILURE;
} }
/** /**
@ -1824,7 +1829,7 @@ test_case_run (GTestCase *tc)
{ {
gchar *old_name = test_run_name, *old_base = g_strdup (test_uri_base); gchar *old_name = test_run_name, *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 = TRUE; 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;
@ -1866,7 +1871,7 @@ test_case_run (GTestCase *tc)
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;
test_run_success = TRUE; test_run_success = G_TEST_RUN_SUCCESS;
g_test_log_set_fatal_handler (NULL, NULL); g_test_log_set_fatal_handler (NULL, NULL);
g_timer_start (test_run_timer); g_timer_start (test_run_timer);
fixture = tc->fixture_size ? g_malloc0 (tc->fixture_size) : tc->test_data; fixture = tc->fixture_size ? g_malloc0 (tc->fixture_size) : tc->test_data;
@ -1888,8 +1893,8 @@ test_case_run (GTestCase *tc)
g_free (fixture); g_free (fixture);
g_timer_stop (test_run_timer); g_timer_stop (test_run_timer);
success = test_run_success; success = test_run_success;
test_run_success = FALSE; test_run_success = G_TEST_RUN_FAILURE;
largs[0] = success ? 0 : 1; /* OK */ largs[0] = success; /* OK */
largs[1] = test_run_forks; largs[1] = test_run_forks;
largs[2] = g_timer_elapsed (test_run_timer, NULL); largs[2] = g_timer_elapsed (test_run_timer, NULL);
g_test_log (G_TEST_LOG_STOP_CASE, NULL, NULL, G_N_ELEMENTS (largs), largs); g_test_log (G_TEST_LOG_STOP_CASE, NULL, NULL, G_N_ELEMENTS (largs), largs);
@ -1904,7 +1909,7 @@ test_case_run (GTestCase *tc)
g_free (test_uri_base); g_free (test_uri_base);
test_uri_base = old_base; test_uri_base = old_base;
return success; return success == G_TEST_RUN_SUCCESS;
} }
static int static int