summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2017-07-13 17:49:13 +0200
committerDavid Lamparter <equinox@opensourcerouting.org>2017-07-13 20:29:22 +0200
commit5c7571d43f57317b0827ac82fbebc4cdc6865be0 (patch)
tree2bc63ccbd805abc9689e9f3345e34871558d5c26 /tests
parentlib: move \n vs. \r\n handling into vty code (diff)
downloadfrr-5c7571d43f57317b0827ac82fbebc4cdc6865be0.tar.xz
frr-5c7571d43f57317b0827ac82fbebc4cdc6865be0.zip
*: ditch vty_outln(), part 1 of 2
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/cli/common_cli.c4
-rw-r--r--tests/lib/cli/test_cli.c8
-rw-r--r--tests/lib/test_heavy.c2
-rw-r--r--tests/lib/test_heavy_thread.c2
-rw-r--r--tests/lib/test_heavy_wq.c2
5 files changed, 9 insertions, 9 deletions
diff --git a/tests/lib/cli/common_cli.c b/tests/lib/cli/common_cli.c
index 728ae8cb0..f1b07ce22 100644
--- a/tests/lib/cli/common_cli.c
+++ b/tests/lib/cli/common_cli.c
@@ -36,10 +36,10 @@ int dump_args(struct vty *vty, const char *descr,
int argc, struct cmd_token *argv[])
{
int i;
- vty_outln (vty, "%s with %d args.", descr, argc);
+ vty_out (vty, "%s with %d args.\n", descr, argc);
for (i = 0; i < argc; i++)
{
- vty_outln (vty, "[%02d] %s@%s: %s", i, argv[i]->text, argv[i]->varname, argv[i]->arg);
+ vty_out (vty, "[%02d] %s@%s: %s\n", i, argv[i]->text, argv[i]->varname, argv[i]->arg);
}
return CMD_SUCCESS;
diff --git a/tests/lib/cli/test_cli.c b/tests/lib/cli/test_cli.c
index 43366d49e..a4d3fb4e8 100644
--- a/tests/lib/cli/test_cli.c
+++ b/tests/lib/cli/test_cli.c
@@ -47,10 +47,10 @@ DEFPY(magic_test, magic_test_cmd,
"1\n2\n3\n4\n5\n")
{
char buf[256];
- vty_outln(vty, "def: %s", self->string);
- vty_outln(vty, "num: %ld", magic);
- vty_outln(vty, "ipv4: %s", prefix2str(ipv4net, buf, sizeof(buf)));
- vty_outln(vty, "ipv6: %s", inet_ntop(AF_INET6, &ipv6, buf, sizeof(buf)));
+ vty_out(vty, "def: %s\n", self->string);
+ vty_out(vty, "num: %ld\n", magic);
+ vty_out(vty, "ipv4: %s\n", prefix2str(ipv4net, buf, sizeof(buf)));
+ vty_out(vty, "ipv6: %s\n", inet_ntop(AF_INET6, &ipv6, buf, sizeof(buf)));
return CMD_SUCCESS;
}
diff --git a/tests/lib/test_heavy.c b/tests/lib/test_heavy.c
index 810d9fda7..382d1623f 100644
--- a/tests/lib/test_heavy.c
+++ b/tests/lib/test_heavy.c
@@ -88,7 +88,7 @@ DEFUN (clear_foo,
char *str;
if (!argc)
{
- vty_outln (vty, "%% string argument required");
+ vty_out (vty, "%% string argument required\n");
return CMD_WARNING;
}
diff --git a/tests/lib/test_heavy_thread.c b/tests/lib/test_heavy_thread.c
index 80c54a827..9e1d70adc 100644
--- a/tests/lib/test_heavy_thread.c
+++ b/tests/lib/test_heavy_thread.c
@@ -112,7 +112,7 @@ DEFUN (clear_foo,
if (!argc)
{
- vty_outln (vty, "%% string argument required");
+ vty_out (vty, "%% string argument required\n");
return CMD_WARNING;
}
diff --git a/tests/lib/test_heavy_wq.c b/tests/lib/test_heavy_wq.c
index 13641f6ed..18b80d081 100644
--- a/tests/lib/test_heavy_wq.c
+++ b/tests/lib/test_heavy_wq.c
@@ -146,7 +146,7 @@ DEFUN (clear_foo,
char *str;
if (!argc)
{
- vty_outln (vty, "%% string argument required");
+ vty_out (vty, "%% string argument required\n");
return CMD_WARNING;
}