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

glib/tests/collate.c: run to completion when skipping all tests

Browse Source 
Otherwise, we don't produce valid TAP output, and fail with:

    ERROR: collate - missing test plan

Bug: https://bugzilla.gnome.org/show_bug.cgi?id=724124
Reviewed-by: Dan Winship <danw>
This commit is contained in:
Simon McVittie 2014-02-11 15:14:33 +00:00
parent 169846c5ab
commit ffa5fab09a
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
glib/tests/collate.c
View File

@ -3,6 +3,8 @@
#include <stdlib.h>
#include <string.h>
static gboolean missing_locale = FALSE;
typedef struct {
const gchar **input;
const gchar **sorted;
@ -45,6 +47,12 @@ do_collate (gboolean for_file, gboolean use_key, const CollateTest *test)
Line line;
gint i;
if (missing_locale)
{
g_test_skip ("no en_US locale");
return;
}
line_array = g_array_new (FALSE, FALSE, sizeof(Line));
g_array_set_clear_func (line_array, (GDestroyNotify)clear_line);
@ -253,8 +261,10 @@ main (int argc, char *argv[])
locale = setlocale (LC_ALL, "");
if (locale == NULL || strcmp (locale, "en_US") != 0)
{
g_test_message ("No suitable locale, skipping test");
return 0;
g_test_message ("No suitable locale, skipping tests");
missing_locale = TRUE;
/* let the tests run to completion so they show up as SKIP'd in TAP
* output */
}
test[0].input = input0;