Kenji Okimoto
null+****@clear*****
Thu Jun 22 12:11:41 JST 2017
Kenji Okimoto 2017-06-22 12:11:41 +0900 (Thu, 22 Jun 2017) New Revision: e5f7cd68e2e2500eeae1088a0abd63c61d13e31c https://github.com/milter-manager/milter-manager/commit/e5f7cd68e2e2500eeae1088a0abd63c61d13e31c Merged 0aa8dff: Merge pull request #124 from milter-manager/fix-test-on-zesty Message: test manager: Fix expected value Because GLib have used Unicode in translatable strings since 2.52.0. Modified files: test/manager/test-manager.c test/manager/test-process-launcher.c Modified: test/manager/test-manager.c (+4 -0) =================================================================== --- test/manager/test-manager.c 2017-06-22 12:10:37 +0900 (2f8f16c) +++ test/manager/test-manager.c 2017-06-22 12:11:41 +0900 (1c168a9) @@ -428,7 +428,11 @@ test_unknown_option (void) "Unknown option --nonexistent\n" "\n" "Usage:\n" +#if GLIB_CHECK_VERSION(2, 52, 0) + " %s [OPTION…]\n" +#else " %s [OPTION...]\n" +#endif "\n" "Help Options:\n" " -h, --help " Modified: test/manager/test-process-launcher.c (+8 -0) =================================================================== --- test/manager/test-process-launcher.c 2017-06-22 12:10:37 +0900 (f50579c) +++ test/manager/test-process-launcher.c 2017-06-22 12:11:41 +0900 (5946e33) @@ -262,7 +262,11 @@ data_launch_error (void) g_quark_to_string(G_SHELL_ERROR), G_SHELL_ERROR_BAD_QUOTING, "Text ended before matching quote was found for \".", +#if GLIB_CHECK_VERSION(2, 52, 0) + "The text was “/bin/echo \"-n”")); +#else "The text was '/bin/echo \"-n'")); +#endif ADD("nonexistent user", "/bin/echo", @@ -273,7 +277,11 @@ data_launch_error (void) "/bin/oecho", g_get_user_name(), cut_take_printf("Couldn't start new process: </bin/oecho>: " +#if GLIB_CHECK_VERSION(2, 52, 0) + "%s:%d: %s “%s” (%s)", +#else "%s:%d: %s \"%s\" (%s)", +#endif g_quark_to_string(G_SPAWN_ERROR), G_SPAWN_ERROR_NOENT, "Failed to execute child process", -------------- next part -------------- An HTML attachment was scrubbed...Download
