Mercurial > vim
changeset 19352:c617ba6413bb v8.2.0234
patch 8.2.0234: message test fails on SunOS
Commit: https://github.com/vim/vim/commit/d5b991493816a2edba7cacdd06820cf3c0abc4dc
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Feb 8 17:14:46 2020 +0100
patch 8.2.0234: message test fails on SunOS
Problem: Message test fails on SunOS.
Solution: Adjust expectation for printf "%p". (Ozaki Kiichi, closes https://github.com/vim/vim/issues/5595)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 08 Feb 2020 17:15:04 +0100 |
parents | d943c3167fa5 |
children | bf41a107b72a |
files | src/message_test.c src/version.c |
diffstat | 2 files changed, 17 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/message_test.c +++ b/src/message_test.c @@ -240,14 +240,26 @@ test_vim_snprintf(void) // %p format is not tested in vim script tests Test_printf*() // as it only makes sense in C code. + // NOTE: SunOS libc doesn't use the prefix "0x" on %p. +#ifdef SUN_SYSTEM +# define PREFIX_LEN 0 +# define PREFIX_STR1 "" +# define PREFIX_STR2 "00" +#else +# define PREFIX_LEN 2 +# define PREFIX_STR1 "0x" +# define PREFIX_STR2 "0x" +#endif n = vim_snprintf(buf, bsize, "%p", ptr); - assert(n == 10); - assert(bsize == 0 || STRNCMP(buf, "0x87654321", bsize_int) == 0); + assert(n == 8 + PREFIX_LEN); + assert(bsize == 0 + || STRNCMP(buf, PREFIX_STR1 "87654321", bsize_int) == 0); assert(bsize == 0 || buf[MIN(n, bsize_int)] == '\0'); n = vim_snprintf(buf, bsize, fmt_012p, ptr); assert(n == 12); - assert(bsize == 0 || STRNCMP(buf, "0x0087654321", bsize_int) == 0); + assert(bsize == 0 + || STRNCMP(buf, PREFIX_STR2 "0087654321", bsize_int) == 0); assert(bsize == 0 || buf[MIN(n, bsize_int)] == '\0'); free(buf);