4 files changed, 101 insertions, 0 deletions

diff --git a/tests/lib/cxxcompat.c b/tests/lib/cxxcompat.c
index 48fa0ec8a9..6624de7386 100644
--- a/tests/lib/cxxcompat.c
+++ b/tests/lib/cxxcompat.c
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#define test__cplusplus
+
 #include "lib/zebra.h"
 
 #include "lib/agg_table.h"
@@ -107,6 +109,17 @@
 #include "lib/zassert.h"
 #include "lib/zclient.h"
 
+PREDECL_RBTREE_UNIQ(footree)
+struct foo {
+	int dummy;
+	struct footree_item item;
+};
+static int foocmp(const struct foo *a, const struct foo *b)
+{
+	return memcmp(&a->dummy, &b->dummy, sizeof(a->dummy));
+}
+DECLARE_RBTREE_UNIQ(footree, struct foo, item, foocmp)
+
 int main(int argc, char **argv)
 {
 	return 0;
diff --git a/tests/lib/test_prefix2str.c b/tests/lib/test_prefix2str.c
new file mode 100644
index 0000000000..cbfc20a797
--- /dev/null
+++ b/tests/lib/test_prefix2str.c
@@ -0,0 +1,80 @@
+/*
+ * prefix2str() unit test
+ * Copyright (C) 2019  David Lamparter
+ * Portions:
+ *     Copyright (C) 2019  Cumulus Networks, Inc
+ *     Quentin Young
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; see the file COPYING; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#include <zebra.h>
+
+#include "lib/prefix.h"
+
+#include "tests/helpers/c/prng.h"
+
+int main(int argc, char **argv)
+{
+	size_t i, j, k, l;
+	struct in6_addr i6;
+	char buf1[64], buf2[64], ntopbuf[64];
+	struct prng *prng;
+	struct prefix p = {};
+
+	prng = prng_new(0);
+	/* IPv4 */
+	p.family = AF_INET;
+	for (i = 0; i < 1000; i++) {
+		p.u.prefix = prng_rand(prng);
+		p.prefixlen = prng_rand(prng) >> 26;
+		snprintf(buf1, sizeof(buf1), "%s/%d",
+			 inet_ntop(AF_INET, &p.u.prefix4, ntopbuf,
+				   sizeof(ntopbuf)),
+			 p.prefixlen);
+		prefix2str(&p, buf2, sizeof(buf2));
+		assert(!strcmp(buf1, buf2));
+		fprintf(stdout, "%s\n", buf1);
+	}
+
+	/* IPv6 */
+	p.family = AF_INET6;
+	for (i = 0; i < 10000; i++) {
+		uint16_t *i6w = (uint16_t *)&i6;
+		for (j = 0; j < 8; j++)
+			i6w[j] = prng_rand(prng);
+
+		/* clear some words */
+		l = prng_rand(prng) & 7;
+		for (j = 0; j < l; j++) {
+			uint32_t num = __builtin_ctz(prng_rand(prng));
+			uint32_t where = prng_rand(prng) & 7;
+
+			for (k = where; k < where + num && k < 8; k++)
+				i6w[k] = 0;
+		}
+
+		p.prefixlen = prng_rand(prng) >> 24;
+		memcpy(&p.u.prefix, &i6, sizeof(i6));
+		snprintf(buf1, sizeof(buf1), "%s/%d",
+			 inet_ntop(AF_INET6, &p.u.prefix6, ntopbuf,
+				   sizeof(ntopbuf)),
+			 p.prefixlen);
+		prefix2str(&p, buf2, sizeof(buf2));
+		assert(!strcmp(buf1, buf2));
+		fprintf(stdout, "%s\n", buf1);
+	}
+
+	return 0;
+}
diff --git a/tests/lib/test_prefix2str.py b/tests/lib/test_prefix2str.py
new file mode 100644
index 0000000000..6e26d1b409
--- /dev/null
+++ b/tests/lib/test_prefix2str.py
@@ -0,0 +1,6 @@
+import frrtest
+
+class TestPrefix2str(frrtest.TestMultiOut):
+    program = './test_prefix2str'
+
+TestPrefix2str.exit_cleanly()
diff --git a/tests/lib/test_printfrr.c b/tests/lib/test_printfrr.c
index c8ef150b07..24de3fa88d 100644
--- a/tests/lib/test_printfrr.c
+++ b/tests/lib/test_printfrr.c
@@ -27,6 +27,7 @@
 
 static int errors;
 
+static void printcmp(const char *fmt, ...) PRINTFRR(1, 2);
 static void printcmp(const char *fmt, ...)
 {
 	va_list ap;
@@ -58,6 +59,7 @@ static void printcmp(const char *fmt, ...)
 		errors++;
 }
 
+static void printchk(const char *ref, const char *fmt, ...) PRINTFRR(2, 3);
 static void printchk(const char *ref, const char *fmt, ...)
 {
 	va_list ap;