diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/.gitignore | 1 | ||||
| -rw-r--r-- | tests/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/lib/cli/common_cli.c | 5 | ||||
| -rw-r--r-- | tests/lib/test_privs.c | 1 | ||||
| -rw-r--r-- | tests/test_lblmgr.c | 3 |
5 files changed, 6 insertions, 8 deletions
diff --git a/tests/.gitignore b/tests/.gitignore index 113bdea098..604ffaa8b6 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -19,7 +19,6 @@ TAGS .arch-inventory .arch-ids __pycache__ -.dirstamp /bgpd/test_aspath /bgpd/test_capability /bgpd/test_ecommunity diff --git a/tests/Makefile.am b/tests/Makefile.am index 0c31c0441a..59ea3c4c69 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -85,9 +85,7 @@ lib/cli/test_commands_defun.c: ../vtysh/vtysh_cmd.c isisd/test_fuzz_isis_tlv_tests.h: $(top_srcdir)/tests/isisd/test_fuzz_isis_tlv_tests.h.gz gzip -d < $(top_srcdir)/tests/isisd/test_fuzz_isis_tlv_tests.h.gz > "$@" - -BUILT_SOURCES = \ - lib/cli/test_commands_defun.c \ +isisd/isisd_test_fuzz_isis_tlv-test_fuzz_isis_tlv.$(OBJEXT): \ isisd/test_fuzz_isis_tlv_tests.h noinst_HEADERS = \ diff --git a/tests/lib/cli/common_cli.c b/tests/lib/cli/common_cli.c index b6df6d3b8d..77f1610fe2 100644 --- a/tests/lib/cli/common_cli.c +++ b/tests/lib/cli/common_cli.c @@ -45,7 +45,7 @@ int dump_args(struct vty *vty, const char *descr, int argc, return CMD_SUCCESS; } -static void vty_do_exit(void) +static void vty_do_exit(int isexit) { printf("\nend.\n"); cmd_terminate(); @@ -54,7 +54,8 @@ static void vty_do_exit(void) closezlog(); log_memstats_stderr("testcli"); - exit(0); + if (!isexit) + exit(0); } /* main routine. */ diff --git a/tests/lib/test_privs.c b/tests/lib/test_privs.c index c2cb5c2ea5..1984f28e63 100644 --- a/tests/lib/test_privs.c +++ b/tests/lib/test_privs.c @@ -108,6 +108,7 @@ int main(int argc, char **argv) /* Library inits. */ memory_init(); + zprivs_preinit(&test_privs); zprivs_init(&test_privs); #define PRIV_STATE() \ diff --git a/tests/test_lblmgr.c b/tests/test_lblmgr.c index afc5ba6630..5e604db61a 100644 --- a/tests/test_lblmgr.c +++ b/tests/test_lblmgr.c @@ -113,8 +113,7 @@ static int zebra_send_release_label_chunk(uint32_t start, uint32_t end) void init_zclient(struct thread_master *master, char *lm_zserv_path) { - if (lm_zserv_path) - zclient_serv_path_set(lm_zserv_path); + frr_zclient_addr(&zclient_addr, &zclient_addr_len, lm_zserv_path); zclient = zclient_new(master); /* zclient_init(zclient, ZEBRA_LABEL_MANAGER, 0); */ |