| Message ID | 20200611224028.3275174-2-keescook@chromium.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | selftests/harness: Switch to TAP output | expand |
On Thu, Jun 11, 2020 at 03:40:22PM -0700, Kees Cook wrote: > Selftest output reporting was happening before the TAP headers and plan > had been emitted. Move the first test reports later. > > Cc: Christian Brauner <christian@brauner.io> > Cc: Shuah Khan <shuah@kernel.org> > Cc: linux-kselftest@vger.kernel.org > Signed-off-by: Kees Cook <keescook@chromium.org> > --- Again, much appreciated: Acked-by: Christian Brauner <christian.brauner@ubuntu.com> > tools/testing/selftests/clone3/clone3.c | 2 +- > tools/testing/selftests/clone3/clone3_clear_sighand.c | 3 +-- > tools/testing/selftests/clone3/clone3_set_tid.c | 2 +- > 3 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/tools/testing/selftests/clone3/clone3.c b/tools/testing/selftests/clone3/clone3.c > index f14c269a5a18..b7e6dec36173 100644 > --- a/tools/testing/selftests/clone3/clone3.c > +++ b/tools/testing/selftests/clone3/clone3.c > @@ -131,9 +131,9 @@ int main(int argc, char *argv[]) > > uid_t uid = getuid(); > > - test_clone3_supported(); > ksft_print_header(); > ksft_set_plan(17); > + test_clone3_supported(); > > /* Just a simple clone3() should return 0.*/ > test_clone3(0, 0, 0, CLONE3_ARGS_NO_TEST); > diff --git a/tools/testing/selftests/clone3/clone3_clear_sighand.c b/tools/testing/selftests/clone3/clone3_clear_sighand.c > index 9e1af8aa7698..db5fc9c5edcf 100644 > --- a/tools/testing/selftests/clone3/clone3_clear_sighand.c > +++ b/tools/testing/selftests/clone3/clone3_clear_sighand.c > @@ -119,9 +119,8 @@ static void test_clone3_clear_sighand(void) > int main(int argc, char **argv) > { > ksft_print_header(); > - test_clone3_supported(); > - > ksft_set_plan(1); > + test_clone3_supported(); > > test_clone3_clear_sighand(); > > diff --git a/tools/testing/selftests/clone3/clone3_set_tid.c b/tools/testing/selftests/clone3/clone3_set_tid.c > index 25beb22f35b5..5831c1082d6d 100644 > --- a/tools/testing/selftests/clone3/clone3_set_tid.c > +++ b/tools/testing/selftests/clone3/clone3_set_tid.c > @@ -157,8 +157,8 @@ int main(int argc, char *argv[]) > pid_t set_tid[MAX_PID_NS_LEVEL * 2]; > > ksft_print_header(); > - test_clone3_supported(); > ksft_set_plan(29); > + test_clone3_supported(); > > if (pipe(pipe_1) < 0 || pipe(pipe_2) < 0) > ksft_exit_fail_msg("pipe() failed\n"); > -- > 2.25.1 >
diff --git a/tools/testing/selftests/clone3/clone3.c b/tools/testing/selftests/clone3/clone3.c index f14c269a5a18..b7e6dec36173 100644 --- a/tools/testing/selftests/clone3/clone3.c +++ b/tools/testing/selftests/clone3/clone3.c @@ -131,9 +131,9 @@ int main(int argc, char *argv[]) uid_t uid = getuid(); - test_clone3_supported(); ksft_print_header(); ksft_set_plan(17); + test_clone3_supported(); /* Just a simple clone3() should return 0.*/ test_clone3(0, 0, 0, CLONE3_ARGS_NO_TEST); diff --git a/tools/testing/selftests/clone3/clone3_clear_sighand.c b/tools/testing/selftests/clone3/clone3_clear_sighand.c index 9e1af8aa7698..db5fc9c5edcf 100644 --- a/tools/testing/selftests/clone3/clone3_clear_sighand.c +++ b/tools/testing/selftests/clone3/clone3_clear_sighand.c @@ -119,9 +119,8 @@ static void test_clone3_clear_sighand(void) int main(int argc, char **argv) { ksft_print_header(); - test_clone3_supported(); - ksft_set_plan(1); + test_clone3_supported(); test_clone3_clear_sighand(); diff --git a/tools/testing/selftests/clone3/clone3_set_tid.c b/tools/testing/selftests/clone3/clone3_set_tid.c index 25beb22f35b5..5831c1082d6d 100644 --- a/tools/testing/selftests/clone3/clone3_set_tid.c +++ b/tools/testing/selftests/clone3/clone3_set_tid.c @@ -157,8 +157,8 @@ int main(int argc, char *argv[]) pid_t set_tid[MAX_PID_NS_LEVEL * 2]; ksft_print_header(); - test_clone3_supported(); ksft_set_plan(29); + test_clone3_supported(); if (pipe(pipe_1) < 0 || pipe(pipe_2) < 0) ksft_exit_fail_msg("pipe() failed\n");
Selftest output reporting was happening before the TAP headers and plan had been emitted. Move the first test reports later. Cc: Christian Brauner <christian@brauner.io> Cc: Shuah Khan <shuah@kernel.org> Cc: linux-kselftest@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> --- tools/testing/selftests/clone3/clone3.c | 2 +- tools/testing/selftests/clone3/clone3_clear_sighand.c | 3 +-- tools/testing/selftests/clone3/clone3_set_tid.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)