From 352e6b5b964065217a3e676c9694cf909168d8c4 Mon Sep 17 00:00:00 2001 From: Guru Prasad Srinivasa Date: Tue, 1 Mar 2016 15:31:43 -0500 Subject: [PATCH] Progress indicators bug-fixes --- test161/tests/syscalls/bigexec.t | 2 +- userland/testbin/bigexec/bigexec.c | 3 +++ userland/testbin/forktest/forktest.c | 2 +- userland/testbin/sparsefile/sparsefile.c | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test161/tests/syscalls/bigexec.t b/test161/tests/syscalls/bigexec.t index 0614b78..a5cef02 100644 --- a/test161/tests/syscalls/bigexec.t +++ b/test161/tests/syscalls/bigexec.t @@ -1,4 +1,4 @@ --- +--- name: "Bigexec Test" description: Tests to ensure that the argument passing logic is not hard-coded diff --git a/userland/testbin/bigexec/bigexec.c b/userland/testbin/bigexec/bigexec.c index 77f3f69..1f92fea 100644 --- a/userland/testbin/bigexec/bigexec.c +++ b/userland/testbin/bigexec/bigexec.c @@ -36,6 +36,7 @@ #include #include +#include #include #include #include @@ -111,6 +112,7 @@ try(const char *first, ...) va_list ap; int num; + nprintf("."); assert(first != NULL); args[0] = _PATH_MYSELF; args[1] = first; @@ -125,6 +127,7 @@ try(const char *first, ...) assert(num < 20); args[num++] = s; } + nprintf("\n"); assert(num < 20); args[num] = NULL; execv(_PATH_MYSELF, (char **)args); diff --git a/userland/testbin/forktest/forktest.c b/userland/testbin/forktest/forktest.c index 367766a..82b44a0 100644 --- a/userland/testbin/forktest/forktest.c +++ b/userland/testbin/forktest/forktest.c @@ -228,7 +228,7 @@ test(int nowait) memset(buffer, 0, 30); len = read(fd, buffer, 30); - printf("%s\n", buffer); + printf("\n%s\n", buffer); if(len != 30) { err(1, "Did not get expected number of characters\n"); } diff --git a/userland/testbin/sparsefile/sparsefile.c b/userland/testbin/sparsefile/sparsefile.c index 9b2c4dc..ea3cb3c 100644 --- a/userland/testbin/sparsefile/sparsefile.c +++ b/userland/testbin/sparsefile/sparsefile.c @@ -81,10 +81,10 @@ main(int argc, char *argv[]) if (r < 0) { err(1, "%s: write", filename); } - nprintf("."); else if (r != 1) { errx(1, "%s: write: Unexpected result count %d", filename, r); } + nprintf("."); // Now check this byte. // First seek to the beginning and then seek back to where the byte