AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-22 10:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

vfprintf: Fix tst-vfprintf-mbs-prec and tst-vfprintf-user-type

Browse Source
This commit is contained in:
Florian Weimer 2017-06-29 13:32:39 +02:00
parent ccfb296472
commit 84d8c5bc8b
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2017-06-29 Florian Weimer <fweimer@redhat.com>
* stdio-common/tst-vfprintf-user-type.c (my_printf_function):
Adjust format string.
* stdio-common/Makefile (tst-vfprintf-mbs-prec.out): Add locale
dependency.
2017-06-29 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/posix/spawni.c (__spawni_child): New function.

1
stdio-common/Makefile
View File

@ -87,6 +87,7 @@ $(objpfx)tst-grouping.out: $(gen-locales)
$(objpfx)tst-sprintf.out: $(gen-locales)
$(objpfx)tst-sscanf.out: $(gen-locales)
$(objpfx)tst-swprintf.out: $(gen-locales)
$(objpfx)tst-vfprintf-mbs-prec.out: $(gen-locales)
endif
tst-printf-bz18872-ENV = MALLOC_TRACE=$(objpfx)tst-printf-bz18872.mtrace

11
stdio-common/tst-vfprintf-user-type.c
View File

@ -29,6 +29,7 @@
#include <support/check.h>
#include <support/support.h>
#include <support/test-driver.h>
#include <wchar.h>
/* Initialized by do_test using register_printf_type. */
static int user_type;
@ -55,8 +56,9 @@ my_printf_function (FILE *fp, const struct printf_info *info,
const void *const *args)
{
if (test_verbose > 0)
printf ("info: %s (%p, %p, {%p}@%p) called for %%%c (prec %d)\n",
__func__, fp, info, args[0], args, info->spec, info->prec);
printf ("info: %s (%p, %p, {%p}@%p) called for %%%lc (prec %d)\n",
__func__, fp, info, args[0], args, (wint_t) info->spec,
info->prec);
TEST_VERIFY (info->spec == 'P');
size_t nargs;
@ -109,8 +111,9 @@ my_arginfo_function (const struct printf_info *info,
if (info->spec != 'P')
return -1;
if (test_verbose > 0)
printf ("info: %s (%p, %zu, %p, %p) called for %%%c (prec %d)\n",
__func__, info, n, argtypes, size, info->spec, info->prec);
printf ("info: %s (%p, %zu, %p, %p) called for %%%lc (prec %d)\n",
__func__, info, n, argtypes, size, (wint_t) info->spec,
info->prec);
TEST_VERIFY_EXIT (n >= 1);
size_t nargs;