comparison src/message_test.c @ 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 7816aa44c145
children aadd1cae2ff5
comparison
equal deleted inserted replaced
19351:d943c3167fa5 19352:c617ba6413bb
238 assert(bsize == 0 || STRNCMP(buf, "\x01\x02", bsize_int) == 0); 238 assert(bsize == 0 || STRNCMP(buf, "\x01\x02", bsize_int) == 0);
239 assert(bsize == 0 || buf[MIN(n, bsize_int)] == '\0'); 239 assert(bsize == 0 || buf[MIN(n, bsize_int)] == '\0');
240 240
241 // %p format is not tested in vim script tests Test_printf*() 241 // %p format is not tested in vim script tests Test_printf*()
242 // as it only makes sense in C code. 242 // as it only makes sense in C code.
243 // NOTE: SunOS libc doesn't use the prefix "0x" on %p.
244 #ifdef SUN_SYSTEM
245 # define PREFIX_LEN 0
246 # define PREFIX_STR1 ""
247 # define PREFIX_STR2 "00"
248 #else
249 # define PREFIX_LEN 2
250 # define PREFIX_STR1 "0x"
251 # define PREFIX_STR2 "0x"
252 #endif
243 n = vim_snprintf(buf, bsize, "%p", ptr); 253 n = vim_snprintf(buf, bsize, "%p", ptr);
244 assert(n == 10); 254 assert(n == 8 + PREFIX_LEN);
245 assert(bsize == 0 || STRNCMP(buf, "0x87654321", bsize_int) == 0); 255 assert(bsize == 0
256 || STRNCMP(buf, PREFIX_STR1 "87654321", bsize_int) == 0);
246 assert(bsize == 0 || buf[MIN(n, bsize_int)] == '\0'); 257 assert(bsize == 0 || buf[MIN(n, bsize_int)] == '\0');
247 258
248 n = vim_snprintf(buf, bsize, fmt_012p, ptr); 259 n = vim_snprintf(buf, bsize, fmt_012p, ptr);
249 assert(n == 12); 260 assert(n == 12);
250 assert(bsize == 0 || STRNCMP(buf, "0x0087654321", bsize_int) == 0); 261 assert(bsize == 0
262 || STRNCMP(buf, PREFIX_STR2 "0087654321", bsize_int) == 0);
251 assert(bsize == 0 || buf[MIN(n, bsize_int)] == '\0'); 263 assert(bsize == 0 || buf[MIN(n, bsize_int)] == '\0');
252 264
253 free(buf); 265 free(buf);
254 } 266 }
255 } 267 }