From ba9620f94756d416dab9869d4f1fd5ea8960fbd3 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Tue, 12 Apr 2022 13:20:48 +0100 Subject: [PATCH 1/2] tests: Ensure NormalizationTest.txt is installed for installed-tests This should fix the installed-tests CI failure: https://gitlab.gnome.org/GNOME/glib/-/jobs/1946794 Signed-off-by: Philip Withnall --- glib/tests/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/glib/tests/meson.build b/glib/tests/meson.build index 40a75debb..bdd0aea74 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build @@ -210,6 +210,7 @@ if installed_tests_enabled 'iochannel-test-infile', 'keyfile.c', 'keyfiletest.ini', + 'NormalizationTest.txt', 'pages.ini', install_dir : installed_tests_execdir, ) From df80a224d757dced2db69cf2f73be75ffa56c6c1 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Tue, 12 Apr 2022 13:21:29 +0100 Subject: [PATCH 2/2] tests: Use g_test_message() rather than fprintf() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This ensures that the output is redirected properly, and prefixed with `#` when outputting in TAP mode, so that it doesn’t confuse the TAP format parser. Signed-off-by: Philip Withnall --- glib/tests/unicode-normalize.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glib/tests/unicode-normalize.c b/glib/tests/unicode-normalize.c index 52426be43..6ff5f516a 100644 --- a/glib/tests/unicode-normalize.c +++ b/glib/tests/unicode-normalize.c @@ -121,7 +121,7 @@ test_unicode_normalize (void) goto next; if (buffer->str[0] == '@') /* Part */ { - fprintf (stderr, "\nProcessing %s\n", buffer->str + 1); + g_test_message ("Processing %s", buffer->str + 1); goto next; }