Kenji Okimoto
null+****@clear*****
Mon Jun 26 10:07:50 JST 2017
Kenji Okimoto 2017-06-26 10:07:50 +0900 (Mon, 26 Jun 2017) New Revision: 9fc1690b6434fff60164a062aa7e8208f9360fa7 https://github.com/milter-manager/milter-manager/commit/9fc1690b6434fff60164a062aa7e8208f9360fa7 Merged 0aa8dff: Merge pull request #124 from milter-manager/fix-test-on-zesty Message: test: Set CHARSET environment varialbe to UTF-8 during test Because `g_get_charset()` returns `"ANSI_X3.4-1968"` during test, in previous version. `g_print()` will convert characters if `g_get_charset()` returns non UTF-8 charset. Modified files: test/manager/test-manager.c Modified: test/manager/test-manager.c (+10 -3) =================================================================== --- test/manager/test-manager.c 2017-06-22 17:33:52 +0900 (86613da) +++ test/manager/test-manager.c 2017-06-26 10:07:50 +0900 (95c556e) @@ -56,6 +56,7 @@ static MilterManagerTestScenario *main_scenario; static gchar *milter_manager_program_name; static gchar *original_lang; +static gchar *oririnal_charset; static gchar *tmp_dir; @@ -177,6 +178,8 @@ cut_setup (void) original_lang = g_strdup(g_getenv("LANG")); g_setenv("LANG", "C", TRUE); + original_charset = g_strdup(g_getenv("CHARSET")); + g_setenv("CHARSET", "UTF-8", TRUE); scenario_dir = g_build_filename(milter_test_get_source_dir(), "test", @@ -231,6 +234,13 @@ cut_teardown (void) g_unsetenv("LANG"); } + if (original_charset) { + g_setenv("CHARSET", original_charset, TRUE); + g_free(original_charset); + } else { + g_unsetenv("CHARSET"); + } + if (loop) g_object_unref(loop); } @@ -416,9 +426,6 @@ void test_unknown_option (void) { GError *error = NULL; -#if GLIB_CHECK_VERSION(2, 52, 0) - cut_pend("GLib 2.52.0 uses Unicode string in message."); -#endif setup_process(manager_data, "--nonexistent", NULL); gcut_process_run(manager_process, &error); -------------- next part -------------- An HTML attachment was scrubbed...下載
