mirror of https://gitee.com/openkylin/glib2.0.git
tests: Don’t rely on output locale of sort in 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
This commit is contained in:
parent
a28e47d6c8
commit
e7d9456c90
|
@ -31,6 +31,7 @@
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <io.h>
|
#include <io.h>
|
||||||
#define pipe(fds) _pipe(fds, 4096, _O_BINARY)
|
#define pipe(fds) _pipe(fds, 4096, _O_BINARY)
|
||||||
|
#include <WinError.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef G_OS_WIN32
|
#ifdef G_OS_WIN32
|
||||||
|
@ -109,8 +110,16 @@ test_spawn_basics (void)
|
||||||
NULL, &erroutput, NULL, &err);
|
NULL, &erroutput, NULL, &err);
|
||||||
g_assert_no_error (err);
|
g_assert_no_error (err);
|
||||||
g_assert_true (result);
|
g_assert_true (result);
|
||||||
|
#ifndef G_OS_WIN32
|
||||||
g_assert_true (g_str_has_prefix (erroutput, "sort: "));
|
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);
|
g_free (erroutput);
|
||||||
erroutput = NULL;
|
erroutput = NULL;
|
||||||
|
|
Loading…
Reference in New Issue