14 files changed, 535 insertions, 25 deletions

diff --git a/tests/lib/cli/common_cli.c b/tests/lib/cli/common_cli.c
index e0981b991a..f9f584f450 100644
--- a/tests/lib/cli/common_cli.c
+++ b/tests/lib/cli/common_cli.c
@@ -7,6 +7,7 @@
  */
 
 #include <zebra.h>
+#include <sys/stat.h>
 
 #include "frrevent.h"
 #include "vty.h"
diff --git a/tests/lib/northbound/test_oper_data.c b/tests/lib/northbound/test_oper_data.c
index f82eddd3bf..8f7e7c5f8c 100644
--- a/tests/lib/northbound/test_oper_data.c
+++ b/tests/lib/northbound/test_oper_data.c
@@ -5,6 +5,7 @@
  */
 
 #include <zebra.h>
+#include <sys/stat.h>
 
 #include "frrevent.h"
 #include "vty.h"
@@ -199,6 +200,25 @@ static struct yang_data *frr_test_module_vrfs_vrf_routes_route_active_get_elem(
 	return NULL;
 }
 
+
+/*
+ * XPath: /frr-test-module:frr-test-module/c1value
+ */
+static struct yang_data *
+frr_test_module_c1value_get_elem(struct nb_cb_get_elem_args *args)
+{
+	return yang_data_new_uint8(args->xpath, 21);
+}
+
+/*
+ * XPath: /frr-test-module:frr-test-module/c2cont/c2value
+ */
+static struct yang_data *
+frr_test_module_c2cont_c2value_get_elem(struct nb_cb_get_elem_args *args)
+{
+	return yang_data_new_uint32(args->xpath, 0xAB010203);
+}
+
 /* clang-format off */
 const struct frr_yang_module_info frr_test_module_info = {
 	.name = "frr-test-module",
@@ -243,6 +263,14 @@ const struct frr_yang_module_info frr_test_module_info = {
 			.cbs.get_elem = frr_test_module_vrfs_vrf_routes_route_active_get_elem,
 		},
 		{
+			.xpath = "/frr-test-module:frr-test-module/c1value",
+			.cbs.get_elem = frr_test_module_c1value_get_elem,
+		},
+		{
+			.xpath = "/frr-test-module:frr-test-module/c2cont/c2value",
+			.cbs.get_elem = frr_test_module_c2cont_c2value_get_elem,
+		},
+		{
 			.xpath = NULL,
 		},
 	}
diff --git a/tests/lib/northbound/test_oper_data.refout b/tests/lib/northbound/test_oper_data.refout
index 57ecd2f0a0..aa930fe127 100644
--- a/tests/lib/northbound/test_oper_data.refout
+++ b/tests/lib/northbound/test_oper_data.refout
@@ -112,6 +112,10 @@ test# show yang operational-data /frr-test-module:frr-test-module
           }

         }

       ]

+    },

+    "c1value": 21,

+    "c2cont": {

+      "c2value": 2868969987

     }

   }

 }

diff --git a/tests/lib/subdir.am b/tests/lib/subdir.am
index e950d0120d..94df3626d6 100644
--- a/tests/lib/subdir.am
+++ b/tests/lib/subdir.am
@@ -15,11 +15,17 @@ tests_lib_test_frrscript_CFLAGS = $(TESTS_CFLAGS)
 tests_lib_test_frrscript_CPPFLAGS = $(TESTS_CPPFLAGS)
 tests_lib_test_frrscript_LDADD = $(ALL_TESTS_LDADD)
 tests_lib_test_frrscript_SOURCES = tests/lib/test_frrscript.c
+EXTRA_tests_lib_test_frrscript_DEPENDENCIES = copy_script
 EXTRA_DIST += tests/lib/test_frrscript.py tests/lib/script1.lua
 
+# For out-of-tree build, lua script needs to be in the build dir, rather than
+# just available somewhere in the VPATH
+copy_script: tests/lib/script1.lua
+	test -e tests/lib/script1.lua || \
+	$(INSTALL_SCRIPT) $< tests/lib/script1.lua
 
 ##############################################################################
-GRPC_TESTS_LDADD = staticd/libstatic.a grpc/libfrrgrpc_pb.la -lgrpc++ -lprotobuf $(ALL_TESTS_LDADD) $(LIBYANG_LIBS) -lm
+GRPC_TESTS_LDADD = mgmtd/libmgmt_be_nb.la staticd/libstatic.a grpc/libfrrgrpc_pb.la $(GRPC_LIBS) $(ALL_TESTS_LDADD) $(LIBYANG_LIBS) -lm
 
 if GRPC
 check_PROGRAMS += tests/lib/test_grpc
@@ -151,6 +157,14 @@ tests_lib_test_checksum_LDADD = $(ALL_TESTS_LDADD)
 tests_lib_test_checksum_SOURCES = tests/lib/test_checksum.c tests/helpers/c/prng.c
 
 
+check_PROGRAMS += tests/lib/test_darr
+tests_lib_test_darr_CFLAGS = $(TESTS_CFLAGS)
+tests_lib_test_darr_CPPFLAGS = $(TESTS_CPPFLAGS)
+tests_lib_test_darr_LDADD = $(ALL_TESTS_LDADD)
+tests_lib_test_darr_SOURCES = tests/lib/test_darr.c
+EXTRA_DIST += tests/lib/test_darr.py
+
+
 check_PROGRAMS += tests/lib/test_graph
 tests_lib_test_graph_CFLAGS = $(TESTS_CFLAGS)
 tests_lib_test_graph_CPPFLAGS = $(TESTS_CPPFLAGS)
diff --git a/tests/lib/test_darr.c b/tests/lib/test_darr.c
new file mode 100644
index 0000000000..74aedac4b7
--- /dev/null
+++ b/tests/lib/test_darr.c
@@ -0,0 +1,422 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * June 23 2023, Christian Hopps <chopps@labn.net>
+ *
+ * Copyright (c) 2023, LabN Consulting, L.L.C.
+ *
+ */
+#include <zebra.h>
+#include "darr.h"
+
+/*
+ * Public functions to test:
+ * [x] - darr_append
+ * [x] - darr_append_n
+ * [x] - darr_append_nz
+ * [x] - darr_cap
+ * [x] - darr_ensure_avail
+ * [x] - darr_ensure_cap
+ * [x] - darr_ensure_i
+ * [x] - darr_foreach_i
+ * [x] - darr_foreach_p
+ * [x] - darr_free
+ * [x] - darr_insert
+ * [ ] - darr_insertz
+ * [x] - darr_insert_n
+ * [x] - darr_insert_nz
+ * [x] - darr_in_sprintf
+ * [x] - darr_in_strcat
+ * [x] - darr_in_strcat_tail
+ * [ ] - darr_in_strcatf
+ * [ ] - darr_in_vstrcatf
+ * [x] - darr_in_strdup
+ * [x] - darr_in_strdup_cap
+ * [-] - darr_in_vsprintf
+ * [x] - darr_lasti
+ * [x] - darr_maxi
+ * [x] - darr_pop
+ * [x] - darr_push
+ * [ ] - darr_pushz
+ * [x] - darr_remove
+ * [x] - darr_remove_n
+ * [x] - darr_reset
+ * [x] - darr_setlen
+ * [x] - darr_set_strlen
+ * [x] - darr_sprintf
+ * [x] - darr_strdup
+ * [x] - darr_strdup_cap
+ * [x] - darr_strlen
+ * [x] - darr_strnul
+ * [ ] - darr_vsprintf
+ */
+
+static void test_int(void)
+{
+	int z105[105] = {0};
+	int a1[] = {0, 1, 2, 3, 4};
+	int a2[] = {4, 3, 2, 1, 0};
+	int *da1 = NULL;
+	int *da2 = NULL;
+	int *dap;
+	uint i;
+
+	assert(darr_len(da1) == 0);
+	assert(darr_lasti(da1) == -1);
+	assert(darr_last(da1) == NULL);
+	assert(darr_end(da1) == NULL);
+
+	darr_ensure_i(da1, 0);
+	da1[0] = 0;
+	assert(darr_len(da1) == 1);
+	assert(darr_cap(da1) == 1);
+
+	*darr_ensure_i(da1, 1) = 1;
+	assert(darr_len(da1) == 2);
+	assert(darr_cap(da1) == 2);
+
+	darr_ensure_i(da1, 4);
+	darr_foreach_i (da1, i)
+		da1[i] = i;
+
+	assert(darr_len(da1) == 5);
+	assert(darr_lasti(da1) == 4);
+	/* minimum non-pow2 array size for long long and smaller */
+	assert(darr_cap(da1) == 8);
+	assert(!memcmp(da1, a1, sizeof(a1)));
+	assert(&da1[darr_lasti(da1)] == darr_last(da1));
+
+	/* reverse the numbers */
+	darr_foreach_p (da1, dap)
+		*dap = darr_end(da1) - dap - 1;
+	assert(!memcmp(da1, a2, sizeof(a2)));
+
+	darr_append_n(da1, 100);
+	darr_foreach_p (da1, dap)
+		*dap = darr_end(da1) - dap - 1;
+
+	darr_pop_n(da1, 100);
+	darr_append_nz(da1, 100);
+	assert(!memcmp(&da1[5], z105, _darr_esize(da1) * 100));
+
+	assert(darr_len(da1) == 105);
+	assert(darr_maxi(da1) == 127);
+	assert(darr_cap(da1) == 128);
+
+	darr_setlen(da1, 102);
+	assert(darr_len(da1) == 102);
+	assert(darr_maxi(da1) == 127);
+
+	int a3[] = { 0xdeadbeaf, 0x12345678 };
+
+	da1[0] = a3[0];
+	da1[101] = a3[1];
+	darr_remove_n(da1, 1, 100);
+	assert(darr_len(da1) == array_size(a3));
+	assert(!memcmp(da1, a3, sizeof(a3)));
+
+	da1[0] = a3[1];
+	da1[1] = a3[0];
+
+	darr_insert_n(da1, 1, 100);
+	assert(darr_len(da1) == 102);
+	assert(da1[0] == a3[1]);
+	assert(da1[101] == a3[0]);
+
+	darr_reset(da1);
+	assert(darr_len(da1) == 0);
+	assert(darr_maxi(da1) == 127);
+	assert(darr_cap(da1) == 128);
+
+	/* we touch the length field of the freed block here somehow */
+	darr_insert_n(da1, 100, 300);
+	assert(darr_len(da1) == 400);
+	assert(darr_cap(da1) == 512);
+
+	da1[400 - 1] = 0x0BAD;
+	*darr_insert(da1, 0) = 0xF00D;
+	assert(da1[0] == 0xF00D);
+	assert(da1[400] == 0x0BAD);
+	assert(darr_len(da1) == 401);
+	assert(darr_cap(da1) == 512);
+
+	darr_free(da1);
+	assert(da1 == NULL);
+	assert(darr_len(da1) == 0);
+	darr_setlen(da1, 0);
+	darr_reset(da1);
+	darr_free(da1);
+
+	*darr_append(da2) = 0;
+	*darr_append(da2) = 1;
+	darr_push(da2, 2);
+	darr_push(da2, 3);
+	darr_push(da2, 4);
+
+	assert(!memcmp(da2, a1, sizeof(a1)));
+
+	assert(darr_pop(da2) == 4);
+	assert(darr_pop(da2) == 3);
+	assert(darr_pop(da2) == 2);
+	assert(darr_len(da2) == 2);
+	assert(darr_pop(da2) == 1);
+	assert(darr_pop(da2) == 0);
+	assert(darr_len(da2) == 0);
+
+	darr_free(da2);
+}
+
+static void test_struct(void)
+{
+	/*
+	 *uwould like to use different sizes with padding but memcmp can't be
+	 *used then.
+	 */
+	struct st {
+		long long a;
+		long long b;
+	};
+	struct st z102[102] = {{0, 0}};
+	struct st *da1 = NULL;
+	struct st *da2 = NULL;
+	struct st a1[] = {
+		{0, 0}, {1, 1}, {2, 2}, {3, 3}, {4, 4},
+	};
+	uint i;
+
+	darr_ensure_i(da1, 0);
+	da1[0].a = 0;
+	da1[0].b = 0;
+	assert(darr_len(da1) == 1);
+	assert(darr_cap(da1) == 1);
+
+	darr_ensure_i(da1, 1)->a = 1;
+	darr_ensure_i(da1, 1)->b = 1;
+	assert(darr_len(da1) == 2);
+	assert(darr_cap(da1) == 2);
+
+	darr_ensure_i(da1, 4);
+	da1[2].a = 2;
+	da1[2].b = 2;
+
+	da1[3].a = 3;
+	da1[3].b = 3;
+
+	da1[4].a = 4;
+	da1[4].b = 4;
+
+	assert(darr_len(da1) == 5);
+	/* minimum non-pow2 array size for long long and smaller */
+	assert(darr_cap(da1) == 8);
+	assert(!memcmp(da1, a1, sizeof(a1)));
+
+	assert(darr_cap(da1) - darr_len(da1) == 3);
+	darr_ensure_avail(da1, 2);
+	assert(darr_cap(da1) == 8);
+	darr_ensure_avail(da1, 3);
+	assert(darr_cap(da1) == 8);
+	darr_ensure_avail(da1, 4);
+	assert(darr_cap(da1) == 16);
+
+	darr_ensure_cap(da1, 16);
+	assert(darr_cap(da1) == 16);
+
+	darr_ensure_cap(da1, 20);
+	assert(darr_cap(da1) == 32);
+
+	darr_append_n(da1, 100);
+
+	assert(darr_len(da1) == 105);
+	assert(darr_maxi(da1) == 127);
+	assert(darr_cap(da1) == 128);
+
+	darr_setlen(da1, 102);
+	assert(darr_len(da1) == 102);
+	assert(darr_maxi(da1) == 127);
+
+	struct st a2[] = {
+		{0xdeadbeaf, 0xdeadbeaf},
+		{0x12345678, 0x12345678},
+	};
+	da1[0] = a2[0];
+	da1[101] = a2[1];
+	darr_remove_n(da1, 1, 100);
+	assert(darr_len(da1) == array_size(a2));
+	assert(!memcmp(da1, a2, sizeof(a2)));
+
+	da1[0] = a2[1];
+	da1[1] = a2[0];
+
+	darr_insert_n(da1, 1, 100);
+	assert(darr_len(da1) == 102);
+	darr_foreach_i (da1, i) {
+		da1[i].a = i;
+		da1[i].b = i;
+	}
+	darr_remove_n(da1, 1, 100);
+	assert(darr_len(da1) == 2);
+	darr_insert_nz(da1, 1, 100);
+	assert(!memcmp(&da1[1], z102, 100 * sizeof(da1[0])));
+	/* assert(da1[0] == a2[1]); */
+	/* assert(da1[101] == a2[0]); */
+
+	darr_reset(da1);
+	assert(darr_len(da1) == 0);
+	assert(darr_maxi(da1) == 127);
+	assert(darr_cap(da1) == 128);
+
+	/* we touch the length field of the freed block here somehow */
+	darr_insert_n(da1, 100, 300);
+
+	assert(darr_len(da1) == 400);
+	assert(darr_cap(da1) == 512);
+
+	darr_free(da1);
+	assert(da1 == NULL);
+
+	assert(darr_len(da1) == 0);
+	darr_setlen(da1, 0);
+	darr_reset(da1);
+
+	darr_free(da1);
+
+	struct st i0 = {0, 0};
+	struct st i1 = {1, 1};
+	struct st i2 = {2, 2};
+	struct st i3 = {3, 3};
+	struct st i4 = {4, 4};
+
+	*darr_append(da2) = i0;
+	*darr_append(da2) = i1;
+	darr_push(da2, i2);
+	darr_push(da2, i3);
+	darr_push(da2, i4);
+
+	assert(!memcmp(da2, a1, sizeof(a1)));
+
+	struct st p0, p1, p2, p3, p4;
+
+	p4 = darr_pop(da2);
+	p3 = darr_pop(da2);
+	p2 = darr_pop(da2);
+	p1 = darr_pop(da2);
+	p0 = darr_pop(da2);
+	assert(darr_len(da2) == 0);
+	assert(p4.a == i4.a && p4.b == i4.b);
+	assert(p3.a == i3.a && p3.b == i3.b);
+	assert(p2.a == i2.a && p2.b == i2.b);
+	assert(p1.a == i1.a && p1.b == i1.b);
+	assert(p0.a == i0.a && p0.b == i0.b);
+
+	darr_free(da2);
+}
+
+static void test_string(void)
+{
+	const char *src = "ABCDE";
+	const char *add = "FGHIJ";
+	uint srclen = strlen(src);
+	uint addlen = strlen(add);
+	char *da1 = NULL;
+	char *da2 = NULL;
+
+	assert(darr_strlen(da1) == 0);
+
+	da1 = darr_strdup(src);
+	assert(darr_strlen(da1) == strlen(da1));
+	assert(darr_strlen(da1) == srclen);
+	assert(darr_len(da1) == srclen + 1);
+	assert(darr_ilen(da1) == (int)srclen + 1);
+	assert(darr_cap(da1) >= 8);
+	assert(darr_last(da1) == darr_strnul(da1));
+	assert(darr_strnul(da1) == da1 + darr_strlen(da1));
+
+	da2 = da1;
+	darr_in_strdup(da1, src);
+	assert(da1 == da2);
+	assert(darr_strlen(da1) == strlen(da1));
+	assert(darr_strlen(da1) == srclen);
+	assert(darr_len(da1) == srclen + 1);
+	darr_free(da1);
+	assert(da1 == NULL);
+
+	da1 = darr_strdup_cap(src, 128);
+	assert(darr_strlen(da1) == srclen);
+	assert(darr_cap(da1) >= 128);
+
+	darr_in_strdup_cap(da1, src, 256);
+	assert(darr_strlen(da1) == srclen);
+	assert(darr_cap(da1) >= 256);
+	darr_free(da1);
+
+	da1 = darr_strdup_cap(add, 2);
+	assert(darr_strlen(da1) == addlen);
+	assert(darr_cap(da1) >= 8);
+
+	darr_in_strdup(da1, "ab");
+	darr_in_strcat(da1, "/");
+	darr_in_strcat(da1, "foo");
+	assert(!strcmp("ab/foo", da1));
+	darr_free(da1);
+
+	da1 = darr_in_strcat(da1, "ab");
+	darr_in_strcat(da1, "/");
+	darr_in_strcat(da1, "foo");
+	assert(!strcmp("ab/foo", da1));
+
+	darr_set_strlen(da1, 5);
+	assert(!strcmp("ab/fo", da1));
+	darr_set_strlen(da1, 1);
+	assert(!strcmp("a", da1));
+
+	darr_in_strdup(da1, "ab");
+	da2 = darr_strdup(add);
+	darr_in_strcat_tail(da1, da2);
+	assert(!strcmp("abHIJ", da1));
+	assert(darr_strlen(da1) == 5);
+	assert(darr_len(da1) == 6);
+	darr_free(da1);
+	darr_free(da2);
+
+	da1 = darr_strdup("abcde");
+	da2 = darr_strdup(add);
+	darr_in_strcat_tail(da1, da2);
+	assert(!strcmp("abcde", da1));
+	assert(darr_strlen(da1) == 5);
+	assert(darr_len(da1) == 6);
+	darr_free(da1);
+	darr_free(da2);
+
+	da1 = darr_sprintf("0123456789: %08X", 0xDEADBEEF);
+	assert(!strcmp(da1, "0123456789: DEADBEEF"));
+	assert(darr_strlen(da1) == 20);
+	assert(darr_cap(da1) == 128);
+	da2 = da1;
+	darr_in_sprintf(da1, "9876543210: %08x", 0x0BADF00D);
+	assert(da1 == da2);
+	assert(!strcmp("9876543210: 0badf00d", da2));
+	darr_free(da1);
+	da2 = NULL;
+
+	da1 = NULL;
+	darr_in_sprintf(da1, "0123456789: %08X", 0xDEADBEEF);
+	assert(!strcmp(da1, "0123456789: DEADBEEF"));
+	assert(darr_strlen(da1) == 20);
+	assert(darr_cap(da1) == 128);
+	darr_free(da1);
+
+	da1 = darr_sprintf("0123456789: %08x", 0xDEADBEEF);
+	darr_in_strcatf(da1, " 9876543210: %08x", 0x0BADF00D);
+	assert(!strcmp("0123456789: deadbeef 9876543210: 0badf00d", da1));
+	darr_free(da1);
+
+	da1 = darr_in_strcatf(da1, "0123456789: %08x", 0xDEADBEEF);
+	assert(!strcmp("0123456789: deadbeef", da1));
+	darr_free(da1);
+}
+
+int main(int argc, char **argv)
+{
+	test_int();
+	test_struct();
+	test_string();
+}
diff --git a/tests/lib/test_darr.py b/tests/lib/test_darr.py
new file mode 100644
index 0000000000..dea3bdf785
--- /dev/null
+++ b/tests/lib/test_darr.py
@@ -0,0 +1,8 @@
+import frrtest
+
+
+class TestDarr(frrtest.TestMultiOut):
+    program = "./test_darr"
+
+
+TestDarr.exit_cleanly()
diff --git a/tests/lib/test_frrlua.c b/tests/lib/test_frrlua.c
index 4f492db5bf..2760a273bd 100644
--- a/tests/lib/test_frrlua.c
+++ b/tests/lib/test_frrlua.c
@@ -13,19 +13,28 @@ static void test_encode_decode(void)
 {
 	lua_State *L = luaL_newstate();
 
-	long long a = 123;
-	long long b = a;
+	int a = 123;
+	int b = a;
 
 	lua_pushintegerp(L, &a);
 	lua_decode_integerp(L, -1, &a);
 	assert(a == b);
 	assert(lua_gettop(L) == 0);
 
+	long long ll_a = 123L;
+	long long ll_b = a;
+
+	lua_pushlonglongp(L, &ll_a);
+	lua_decode_longlongp(L, -1, &ll_a);
+	assert(ll_a == ll_b);
+	assert(lua_gettop(L) == 0);
+
 	time_t time_a = 100;
-	time_t time_b = time_a;
+	time_t time_b;
 
-	lua_pushtimet(L, &time_a);
-	lua_decode_timet(L, -1, &time_a);
+	lua_pushinteger(L, time_a);
+	time_b = lua_tointeger(L, -1);
+	lua_pop(L, 1);
 	assert(time_a == time_b);
 	assert(lua_gettop(L) == 0);
 
diff --git a/tests/lib/test_frrscript.c b/tests/lib/test_frrscript.c
index 7d4746cf3e..9698aeaa6c 100644
--- a/tests/lib/test_frrscript.c
+++ b/tests/lib/test_frrscript.c
@@ -32,7 +32,7 @@ int main(int argc, char **argv)
 	assert(result == 0);
 	result = frrscript_call(fs, "bar", ("a", &a), ("b", &b));
 	assert(result == 0);
-	long long *cptr = frrscript_get_result(fs, "bar", "c", lua_tointegerp);
+	long long *cptr = frrscript_get_result(fs, "bar", "c", lua_tolonglongp);
 
 	/* a should not occur in the returned table in script */
 	assert(a == 100);
@@ -47,7 +47,7 @@ int main(int argc, char **argv)
 	result = frrscript_call(fs, "fact", ("n", &n));
 	assert(result == 0);
 	long long *ansptr =
-		frrscript_get_result(fs, "fact", "ans", lua_tointegerp);
+		frrscript_get_result(fs, "fact", "ans", lua_tolonglongp);
 	assert(*ansptr == 120);
 
 	/* check consecutive call + get_result without re-loading */
diff --git a/tests/lib/test_grpc.cpp b/tests/lib/test_grpc.cpp
index fd30f04346..202313603d 100644
--- a/tests/lib/test_grpc.cpp
+++ b/tests/lib/test_grpc.cpp
@@ -34,8 +34,8 @@
 #include <grpcpp/security/credentials.h>
 #include "grpc/frr-northbound.grpc.pb.h"
 
-DEFINE_HOOK(frr_late_init, (struct event_loop * tm), (tm));
-DEFINE_KOOH(frr_fini, (), ());
+DEFINE_HOOK(test_grpc_late_init, (struct event_loop * tm), (tm));
+DEFINE_KOOH(test_grpc_fini, (), ());
 
 struct vty *vty;
 
@@ -85,13 +85,24 @@ static void static_startup(void)
 	zprivs_init(&static_privs);
 
 	/* Load the server side module -- check libtool path first */
-	std::string modpath = std::string(binpath) + std::string("../../../lib/.libs");
+	std::string modpath = std::string(binpath) + std::string("../../lib/.libs");
 	grpc_module = frrmod_load("grpc:50051", modpath.c_str(), 0, 0);
 	if (!grpc_module) {
 		modpath = std::string(binpath) +  std::string("../../lib");
 		grpc_module = frrmod_load("grpc:50051", modpath.c_str(),
 					  _err_print, 0);
 	}
+	if (!grpc_module) {
+		modpath = std::string(binpath) +
+			  std::string("../../../lib/.libs");
+		grpc_module = frrmod_load("grpc:50051", modpath.c_str(),
+					  _err_print, 0);
+	}
+	if (!grpc_module) {
+		modpath = std::string(binpath) + std::string("../../../lib");
+		grpc_module = frrmod_load("grpc:50051", modpath.c_str(),
+					  _err_print, 0);
+	}
 	if (!grpc_module)
 		exit(1);
 
@@ -108,13 +119,15 @@ static void static_startup(void)
 
 	hook_register(routing_conf_event,
 		      routing_control_plane_protocols_name_validate);
-
-	routing_control_plane_protocols_register_vrf_dependency();
+	hook_register(routing_create,
+		      routing_control_plane_protocols_staticd_create);
+	hook_register(routing_destroy,
+		      routing_control_plane_protocols_staticd_destroy);
 
 	// Add a route
 	vty = vty_new();
 	vty->type = vty::VTY_TERM;
-	vty_config_enter(vty, true, false);
+	vty_config_enter(vty, true, false, false);
 
 	auto ret = cmd_execute(vty, "ip route 11.0.0.0/8 Null0", NULL, 0);
 	assert(!ret);
@@ -127,12 +140,12 @@ static void static_startup(void)
 	frr_pthread_init();
 
 	// frr_config_fork();
-	hook_call(frr_late_init, master);
+	hook_call(test_grpc_late_init, master);
 }
 
 static void static_shutdown(void)
 {
-	hook_call(frr_fini);
+	hook_call(test_grpc_fini);
 	vty_close(vty);
 	vrf_terminate();
 	vty_terminate();
diff --git a/tests/lib/test_heavy_wq.c b/tests/lib/test_heavy_wq.c
index 225573ae92..8c2765cfdf 100644
--- a/tests/lib/test_heavy_wq.c
+++ b/tests/lib/test_heavy_wq.c
@@ -76,12 +76,6 @@ static wq_item_status slow_func(struct work_queue *wq, void *data)
 	for (j = 0; j < 300; j++)
 		x += sin(x) * j;
 
-	if ((hn->i % ITERS_LATER) == 0)
-		return WQ_RETRY_LATER;
-
-	if ((hn->i % ITERS_ERR) == 0)
-		return WQ_RETRY_NOW;
-
 	if ((hn->i % ITERS_PRINT) == 0)
 		printf("%s did %d, x = %g\n", hn->str, hn->i, x);
 
diff --git a/tests/lib/test_nexthop_iter.c b/tests/lib/test_nexthop_iter.c
index 91380f1111..33ff116890 100644
--- a/tests/lib/test_nexthop_iter.c
+++ b/tests/lib/test_nexthop_iter.c
@@ -19,9 +19,10 @@ static int verbose;
 static void str_append(char **buf, const char *repr)
 {
 	if (*buf) {
-		*buf = realloc(*buf, strlen(*buf) + strlen(repr) + 1);
+		size_t new_size = strlen(*buf) + strlen(repr) + 1;
+		*buf = realloc(*buf, new_size);
 		assert(*buf);
-		strncpy((*buf) + strlen(*buf), repr, strlen(repr) + 1);
+		(void)strlcat(*buf, repr, new_size);
 	} else {
 		*buf = strdup(repr);
 		assert(*buf);
diff --git a/tests/lib/test_printfrr.c b/tests/lib/test_printfrr.c
index 0ab40b2ecd..cefa07ec73 100644
--- a/tests/lib/test_printfrr.c
+++ b/tests/lib/test_printfrr.c
@@ -143,6 +143,8 @@ int main(int argc, char **argv)
 		NAN,
 	};
 	uint64_t ui64 = 0xfeed1278cafef00d;
+	uint16_t i16 = -23456;
+	int_fast8_t if8 = 123;
 	struct in_addr ip;
 	char *p;
 	char buf[256];
@@ -166,6 +168,19 @@ int main(int argc, char **argv)
 	printchk("-77385308584349683 18369358765125201933 feed1278cafef00d",
 		 "%Ld %Lu %Lx", ui64, ui64, ui64);
 
+	FMT_NSTD(printchk("11110000000011111010010111000011", "%b", 0xf00fa5c3));
+	FMT_NSTD(printchk("0b01011010", "%#010b", 0x5a));
+
+/* FMT_NSTD is conditional on the frr-format plugin being NOT enabled.
+ * However, the frr-format plugin does not support %wd/%wfd yet, so this needs
+ * to be unconditional.
+ */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat"
+	printchk("123 -23456 feed1278cafef00d 9876", "%wf8d %w16d %w64x %d",
+		 if8, i16, ui64, 9876);
+#pragma GCC diagnostic pop
+
 	inet_aton("192.168.1.2", &ip);
 	printchk("192.168.1.2", "%pI4", &ip);
 	printchk("         192.168.1.2", "%20pI4", &ip);
diff --git a/tests/lib/test_privs.c b/tests/lib/test_privs.c
index e26754857b..caf55c718f 100644
--- a/tests/lib/test_privs.c
+++ b/tests/lib/test_privs.c
@@ -3,6 +3,7 @@
  */
 
 #include <zebra.h>
+#include <sys/stat.h>
 
 #include <lib/version.h>
 #include "getopt.h"
diff --git a/tests/lib/test_segv.c b/tests/lib/test_segv.c
index af5f3aec63..5d2f451ebd 100644
--- a/tests/lib/test_segv.c
+++ b/tests/lib/test_segv.c
@@ -61,7 +61,7 @@ int main(void)
 
 	zlog_aux_init("NONE: ", LOG_DEBUG);
 
-	event_execute(master, threadfunc, 0, 0);
+	event_execute(master, threadfunc, 0, 0, NULL);
 
 	exit(0);
 }