[libgweather/skip-locale] Do not run local-dependent tests with missing locales
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgweather/skip-locale] Do not run local-dependent tests with missing locales
- Date: Mon, 9 Mar 2020 12:23:29 +0000 (UTC)
commit 8b20cd91a96eae39bafe82ccf444dbc00759ad43
Author: Emmanuele Bassi <ebassi gnome org>
Date: Mon Mar 9 12:21:57 2020 +0000
Do not run local-dependent tests with missing locales
Not everyone has all the locales installed all the time, so let's check
if a locale is available before using it.
libgweather/test_libgweather.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
---
diff --git a/libgweather/test_libgweather.c b/libgweather/test_libgweather.c
index 8a21911..77ee459 100644
--- a/libgweather/test_libgweather.c
+++ b/libgweather/test_libgweather.c
@@ -643,6 +643,7 @@ static void
test_location_names (void)
{
GWeatherLocation *world, *brussels;
+ char *old_locale;
world = gweather_location_get_world ();
g_assert (world);
@@ -653,7 +654,16 @@ test_location_names (void)
g_assert_cmpstr (gweather_location_get_sort_name (brussels), ==, "brussels");
g_assert_cmpstr (gweather_location_get_english_name (brussels), ==, "Brussels");
+ old_locale = g_strdup (setlocale (LC_ALL, NULL));
setlocale (LC_ALL, "fr_FR.UTF-8");
+ if (strstr (setlocale (LC_ALL, NULL), "fr_FR.UTF-8") == NULL)
+ {
+ g_test_skip ("locale fr_FR.UTF-8 not available, skipping localization tests");
+ setlocale (LC_ALL, old_locale);
+ g_free (old_locale);
+ return;
+ }
+
_gweather_location_reset_world ();
world = gweather_location_get_world ();
@@ -665,7 +675,7 @@ test_location_names (void)
g_assert_cmpstr (gweather_location_get_sort_name (brussels), ==, "bruxelles");
g_assert_cmpstr (gweather_location_get_english_name (brussels), ==, "Brussels");
- setlocale (LC_ALL, "");
+ setlocale (LC_ALL, old_locale);
_gweather_location_reset_world ();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]