| Message ID | 20240220192235.2953484-10-kuba@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 378193eff3399acb8529d0b553709e8f91d34fe3 |
| Headers | show |
| Series | selftests: kselftest_harness: support using xfail | expand |
On Tue, Feb 20, 2024 at 11:22:33AM -0800, Jakub Kicinski wrote: > Switch to printing KTAP line for PASS / FAIL with ksft_test_result_code(), > this gives us the ability to report diagnostic messages. > > Signed-off-by: Jakub Kicinski <kuba@kernel.org> Reviewed-by: Kees Cook <keescook@chromium.org>
diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h index 6157a7b059c6..7c3d19bf4220 100644 --- a/tools/testing/selftests/kselftest_harness.h +++ b/tools/testing/selftests/kselftest_harness.h @@ -1147,14 +1147,13 @@ void __run_test(struct __fixture_metadata *f, if (t->results->reason[0]) diagnostic = t->results->reason; + else if (t->exit_code == KSFT_PASS || t->exit_code == KSFT_FAIL) + diagnostic = NULL; else diagnostic = "unknown"; - if (t->exit_code == KSFT_SKIP) - ksft_test_result_code(t->exit_code, test_name, - "%s", diagnostic); - else - ksft_test_result(__test_passed(t), "%s\n", test_name); + ksft_test_result_code(t->exit_code, test_name, + diagnostic ? "%s" : "", diagnostic); } static int test_harness_run(int argc, char **argv)
Switch to printing KTAP line for PASS / FAIL with ksft_test_result_code(), this gives us the ability to report diagnostic messages. Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- tools/testing/selftests/kselftest_harness.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)