diff options
| author | Florian Weimer <fweimer@redhat.com> | 2017-06-29 13:32:39 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2017-06-29 16:46:03 +0200 |
| commit | 84d8c5bc8b4815bbdd4395f419aed047db3b67e3 (patch) | |
| tree | bc4931d132af0e8ed5d4d0d8c728710eba32041b | |
| parent | ccfb2964726512f6669fea99a43afa714e2e6a80 (diff) | |
| download | glibc-84d8c5bc8b4815bbdd4395f419aed047db3b67e3.tar.gz glibc-84d8c5bc8b4815bbdd4395f419aed047db3b67e3.tar.xz glibc-84d8c5bc8b4815bbdd4395f419aed047db3b67e3.zip | |
vfprintf: Fix tst-vfprintf-mbs-prec and tst-vfprintf-user-type
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | stdio-common/Makefile | 1 | ||||
| -rw-r--r-- | stdio-common/tst-vfprintf-user-type.c | 11 |
3 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 61f453df7b..147dcaaab8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/stdio-common/Makefile b/stdio-common/Makefile index 309d83ec01..622a85f329 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -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 diff --git a/stdio-common/tst-vfprintf-user-type.c b/stdio-common/tst-vfprintf-user-type.c index e9596c3080..91ea02f382 100644 --- a/stdio-common/tst-vfprintf-user-type.c +++ b/stdio-common/tst-vfprintf-user-type.c @@ -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; |