luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-28 23:16:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'lrn/binary-tests' into 'master'

Browse Source 
Force binary mode for stdout in printf tests

See merge request GNOME/glib!89
This commit is contained in:
Philip Withnall 2018-06-11 15:06:25 +00:00
commit 54498aa7ae
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
glib/tests/test-printf.c
View File

@ -24,6 +24,10 @@
#include <string.h> #include <string.h>
#include "glib.h" #include "glib.h"
#include "gstdio.h" #include "gstdio.h"
#ifdef G_OS_WIN32
#include <io.h>
#include <fcntl.h>
#endif
static void static void
test_retval_and_trunc (void) test_retval_and_trunc (void)
@ -637,11 +641,7 @@ test_positional_params2 (void)
} }
g_test_trap_subprocess (NULL, 0, 0); g_test_trap_subprocess (NULL, 0, 0);
g_test_trap_assert_passed (); g_test_trap_assert_passed ();
#ifndef G_OS_WIN32
g_test_trap_assert_stdout ("a b\n ab\nabcabc\n"); g_test_trap_assert_stdout ("a b\n ab\nabcabc\n");
#else
g_test_trap_assert_stdout ("a b\r\n ab\r\nabcabc\r\n");
#endif
} }
static void static void
@ -858,25 +858,17 @@ _Pragma ("GCC diagnostic pop")
static void static void
test_64bit2 (void) test_64bit2 (void)
{ {
#ifndef G_OS_WIN32
g_test_trap_subprocess ("/printf/test-64bit/subprocess/base", 0, 0); g_test_trap_subprocess ("/printf/test-64bit/subprocess/base", 0, 0);
g_test_trap_assert_passed (); g_test_trap_assert_passed ();
g_test_trap_assert_stdout ("123456\n-123456\n123456\n" g_test_trap_assert_stdout ("123456\n-123456\n123456\n"
"361100\n0361100\n1e240\n" "361100\n0361100\n1e240\n"
"0x1e240\n1E240\n"); "0x1e240\n1E240\n");
#ifdef G_OS_WIN32
#else
g_test_trap_subprocess ("/printf/test-64bit/subprocess/base", 0, 0);
g_test_trap_assert_passed ();
g_test_trap_assert_stdout ("123456\r\n-123456\r\n123456\r\n"
"361100\r\n0361100\r\n1e240\r\n"
"0x1e240\r\n1E240\r\n");
g_test_trap_subprocess ("/printf/test-64bit/subprocess/win32", 0, 0); g_test_trap_subprocess ("/printf/test-64bit/subprocess/win32", 0, 0);
g_test_trap_assert_passed (); g_test_trap_assert_passed ();
g_test_trap_assert_stdout ("123456\r\n-123456\r\n123456\r\n" g_test_trap_assert_stdout ("123456\n-123456\n123456\n"
"361100\r\n0361100\r\n1e240\r\n" "361100\n0361100\n1e240\n"
"0x1e240\r\n1E240\r\n"); "0x1e240\n1E240\n");
#endif #endif
} }
@ -907,6 +899,13 @@ int
main (int argc, main (int argc,
char *argv[]) char *argv[])
{ {
#ifdef G_OS_WIN32
/* Ensure binary mode for stdout, this way
* tests produce \n line endings on Windows instead of the
* default \r\n.
*/
_setmode (fileno (stdout), _O_BINARY);
#endif
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
g_test_add_func ("/snprintf/retval-and-trunc", test_retval_and_trunc); g_test_add_func ("/snprintf/retval-and-trunc", test_retval_and_trunc);