diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-08-09 20:32:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-09 20:32:44 +0200 |
| commit | f790234f2ff2e1d6c7a230e5c1d9dac280a12d44 (patch) | |
| tree | b4815bc05f3bc7f54ebf39c773af30cce3a5d19a /tests | |
| parent | Merge pull request #942 from lunn/eigrpd-debug (diff) | |
| parent | watchfrr: print specific error for removed options (diff) | |
| download | frr-f790234f2ff2e1d6c7a230e5c1d9dac280a12d44.tar.xz frr-f790234f2ff2e1d6c7a230e5c1d9dac280a12d44.zip | |
Merge pull request #892 from opensourcerouting/watchfrr-simplify
simplify watchfrr, add --terminal, improve startup logging
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/cli/common_cli.c | 5 | ||||
| -rw-r--r-- | tests/lib/test_privs.c | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/lib/cli/common_cli.c b/tests/lib/cli/common_cli.c index b6df6d3b8..77f1610fe 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 c2cb5c2ea..1984f28e6 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() \ |