Commit f6032b75 authored by Emmanuele Bassi's avatar Emmanuele Bassi

tests: Update the locale use

Create the PangoContext for the test after resetting the locale, and use
the en_US.utf8 name, as it seems to be the name used by Fedora.
parent c3de8bca
Pipeline #186655 passed with stages
in 2 minutes and 33 seconds
......@@ -242,7 +242,7 @@ test_break (gconstpointer d)
gchar *diff;
const char *old_locale = setlocale (LC_ALL, NULL);
setlocale (LC_ALL, "en_US.UTF-8");
setlocale (LC_ALL, "en_US.utf8");
if (strstr (setlocale (LC_ALL, NULL), "en_US") == NULL)
{
char *msg = g_strdup_printf ("Locale en_US.UTF-8 not available, skipping break %s", filename);
......@@ -251,6 +251,9 @@ test_break (gconstpointer d)
return;
}
if (context == NULL)
context = pango_font_map_create_context (pango_cairo_font_map_get_default ());
expected_file = get_expected_filename (filename);
dump = g_string_sized_new (0);
......@@ -293,8 +296,6 @@ main (int argc, char *argv[])
g_test_init (&argc, &argv, NULL);
context = pango_font_map_create_context (pango_cairo_font_map_get_default ());
/* allow to easily generate expected output for new test cases */
if (argc > 1)
{
......
......@@ -238,7 +238,7 @@ test_itemize (gconstpointer d)
gchar *diff;
const char *old_locale = setlocale (LC_ALL, NULL);
setlocale (LC_ALL, "en_US.UTF-8");
setlocale (LC_ALL, "en_US.utf8");
if (strstr (setlocale (LC_ALL, NULL), "en_US") == NULL)
{
char *msg = g_strdup_printf ("Locale en_US.UTF-8 not available, skipping itemization %s", filename);
......@@ -247,6 +247,8 @@ test_itemize (gconstpointer d)
return;
}
context = pango_font_map_create_context (pango_cairo_font_map_get_default ());
expected_file = get_expected_filename (filename);
dump = g_string_sized_new (0);
......@@ -289,8 +291,6 @@ main (int argc, char *argv[])
g_test_init (&argc, &argv, NULL);
context = pango_font_map_create_context (pango_cairo_font_map_get_default ());
/* allow to easily generate expected output for new test cases */
if (argc > 1)
{
......
......@@ -305,7 +305,7 @@ test_layout (gconstpointer d)
gchar *diff;
const char *old_locale = setlocale (LC_ALL, NULL);
setlocale (LC_ALL, "en_US.UTF-8");
setlocale (LC_ALL, "en_US.utf8");
if (strstr (setlocale (LC_ALL, NULL), "en_US") == NULL)
{
char *msg = g_strdup_printf ("Locale en_US.UTF-8 not available, skipping layout %s", filename);
......@@ -314,6 +314,9 @@ test_layout (gconstpointer d)
return;
}
if (context == NULL)
context = pango_font_map_create_context (pango_cairo_font_map_get_default ());
expected_file = get_expected_filename (filename);
dump = g_string_sized_new (0);
......@@ -355,8 +358,6 @@ main (int argc, char *argv[])
g_test_init (&argc, &argv, NULL);
context = pango_font_map_create_context (pango_cairo_font_map_get_default ());
/* allow to easily generate expected output for new test cases */
if (argc > 1)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment