Skip to content

Commit

Permalink
tests: apparmor: Always end with a newline
Browse files Browse the repository at this point in the history
Some error messages in lxc-test-apparmor didn't end with a newline,
leading to slightly difficult to read output.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
  • Loading branch information
stgraber committed Jun 15, 2014
1 parent a008066 commit fe5652a
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/tests/aa.c
Expand Up @@ -69,21 +69,21 @@ static int do_test_file_open(struct lxc_container *c, char *fnam)

ret = pipe(pipefd);
if (ret < 0) {
fprintf(stderr, "pipe failed %d", ret);
fprintf(stderr, "pipe failed %d\n", ret);
return fret;
}
attach_options.stdout_fd = pipefd[1];
attach_options.attach_flags &= ~(LXC_ATTACH_LSM_EXEC|LXC_ATTACH_DROP_CAPABILITIES);
attach_options.attach_flags |= LXC_ATTACH_LSM_NOW;
ret = c->attach(c, test_attach_write_file, fnam, &attach_options, &pid);
if (ret < 0) {
fprintf(stderr, "attach failed");
fprintf(stderr, "attach failed\n");
goto err1;
}

ret = read(pipefd[0], result, sizeof(result)-1);
if (ret < 0) {
fprintf(stderr, "read failed %d", ret);
fprintf(stderr, "read failed %d\n", ret);
goto err2;
}

Expand Down Expand Up @@ -117,7 +117,7 @@ static bool test_aa_policy(struct lxc_container *c)
for (i = 0; files_to_deny[i]; i++) {
ret = do_test_file_open(c, files_to_deny[i]);
if (ret < 0) {
fprintf(stderr, "attach failed; skipping test");
fprintf(stderr, "attach failed; skipping test\n");
return true;
}
if (ret > 0) {
Expand All @@ -131,7 +131,7 @@ static bool test_aa_policy(struct lxc_container *c)
for (i = 0; files_to_allow[i]; i++) {
ret = do_test_file_open(c, files_to_allow[i]);
if (ret < 0) {
fprintf(stderr, "attach failed; skipping test");
fprintf(stderr, "attach failed; skipping test\n");
return true;
}
if (ret == 0) {
Expand Down Expand Up @@ -176,7 +176,7 @@ int main(int argc, char *argv[])

c->want_daemonize(c, true);
if (!c->startl(c, 0, NULL)) {
fprintf(stderr, "Error starting container");
fprintf(stderr, "Error starting container\n");
goto err;
}

Expand Down

0 comments on commit fe5652a

Please sign in to comment.