[glib/halfline/test-case-pipe-confusion: 1/7] tests: Fix checks for line endings in spawn-test on Windows




commit 0d6e0cea8609cbde0494bca428f82219e3abd09b
Author: Philip Withnall <pwithnall endlessos org>
Date:   Fri Oct 14 17:56:04 2022 +0100

    tests: Fix checks for line endings in spawn-test on Windows
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>

 glib/tests/spawn-test.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/glib/tests/spawn-test.c b/glib/tests/spawn-test.c
index 4e54ab258e..44d585dcfe 100644
--- a/glib/tests/spawn-test.c
+++ b/glib/tests/spawn-test.c
@@ -97,7 +97,10 @@ test_spawn_basics (void)
                                       &output, &erroutput, NULL, &err);
   g_assert_no_error (err);
   g_assert_true (result);
-  g_assert_cmpstr (output, ==, "line 2\nline first\nline last\n");
+  if (strchr (output, '\r') != NULL)
+    g_assert_cmpstr (output, ==, "line 2\r\nline first\r\nline last\r\n");
+  else
+    g_assert_cmpstr (output, ==, "line 2\nline first\nline last\n");
   g_assert_cmpstr (erroutput, ==, "");
 
   g_free (output);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]