commit ffc9ac559996a165231221571b61fff3b8af556e
author Philip Withnall <philip@tecnocode.co.uk> Thu Apr 08 13:41:05 2021 +0000
committer Philip Withnall <philip@tecnocode.co.uk> Thu Apr 08 13:41:05 2021 +0000
tree 3758a9a9b5ba1dab94de141544f0f606af2aa81b
parent 484531600ca39ebabb5f58c397df4f4622d2ebfd
parent 2e3775426199ad3ac4b080251aa23b47d82d4122

Merge branch 'backport-2026-log-lines-glib-2-68' into 'glib-2-68'

Backport !2026 “Split g_test_log() messages that contain multiple lines” to glib-2-68

See merge request GNOME/glib!2035

glib/gtestutils.c

diff --git a/glib/gtestutils.c b/glib/gtestutils.c
index d24c6e1..d9a04e0 100644
--- a/glib/gtestutils.c
+++ b/glib/gtestutils.c
@@ -1072,7 +1072,20 @@
       break;
     case G_TEST_LOG_MESSAGE:
       if (test_tap_log)
-        g_print ("# %s\n", string1);
+        {
+          if (strstr (string1, "\n") == NULL)
+            g_print ("# %s\n", string1);
+          else
+            {
+              char **lines = g_strsplit (string1, "\n", -1);
+              gsize i;
+
+              for (i = 0; lines[i] != NULL; i++)
+                g_print ("# %s\n", lines[i]);
+
+              g_strfreev (lines);
+            }
+        }
       else if (g_test_verbose ())
         g_print ("(MSG: %s)\n", string1);
       break;