1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
From: Philip Withnall <pwithnall@endlessos.org>
Date: Thu, 13 Oct 2022 13:39:48 +0100
Subject: =?utf-8?q?tests=3A_Don=E2=80=99t_rely_on_output_locale_of_sort_in_?=
=?utf-8?q?spawn-test?=
Otherwise the test will fail when run in a non-English locale.
Fix suggested by Simon McVittie.
Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
Bug: https://gitlab.gnome.org/GNOME/glib/-/issues/2754
Origin: upstream, 2.75.0, commit:360fc4cda351705102e72e1eeb3c4385fa7fda62
---
glib/tests/spawn-test.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/glib/tests/spawn-test.c b/glib/tests/spawn-test.c
index 4e54ab2..e4f2efc 100644
--- a/glib/tests/spawn-test.c
+++ b/glib/tests/spawn-test.c
@@ -31,6 +31,7 @@
#include <fcntl.h>
#include <io.h>
#define pipe(fds) _pipe(fds, 4096, _O_BINARY)
+#include <WinError.h>
#endif
#ifdef G_OS_WIN32
@@ -109,8 +110,16 @@ test_spawn_basics (void)
NULL, &erroutput, NULL, &err);
g_assert_no_error (err);
g_assert_true (result);
+#ifndef G_OS_WIN32
g_assert_true (g_str_has_prefix (erroutput, "sort: "));
- g_assert_nonnull (strstr (erroutput, "No such file or directory"));
+ g_assert_nonnull (strstr (erroutput, g_strerror (ENOENT)));
+#else
+ {
+ gchar *file_not_found_message = g_win32_error_message (ERROR_FILE_NOT_FOUND);
+ g_assert_nonnull (strstr (erroutput, file_not_found_message));
+ g_free (file_not_found_message);
+ }
+#endif
g_free (erroutput);
erroutput = NULL;
|
