From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 8 Feb 2020 16:14:46 +0000 (+0100)
Subject: patch 8.2.0234: message test fails on SunOS
X-Git-Tag: v8.2.0234
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5b991493816a2edba7cacdd06820cf3c0abc4dc;p=vim

patch 8.2.0234: message test fails on SunOS

Problem:    Message test fails on SunOS.
Solution:   Adjust expectation for printf "%p". (Ozaki Kiichi, closes #5595)
---

diff --git a/src/message_test.c b/src/message_test.c
index 3397a9cb4..7f6540b31 100644
--- 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);
diff --git a/src/version.c b/src/version.c
index 99c63569d..e1c6e319b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    234,
 /**/
     233,
 /**/