summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2024-02-29 03:59:17 +0300
committerDavid S. Miller <davem@davemloft.net>2024-03-01 13:30:29 +0300
commit378193eff3399acb8529d0b553709e8f91d34fe3 (patch)
treec548cf91512b37390cb49e933896b734fe59e31c
parent42ab727eb95fcff83e7a67fcdbf467bbcd53451e (diff)
downloadlinux-378193eff3399acb8529d0b553709e8f91d34fe3.tar.xz
selftests: kselftest_harness: let PASS / FAIL provide diagnostic
Switch to printing KTAP line for PASS / FAIL with ksft_test_result_code(), this gives us the ability to report diagnostic messages. Reviewed-by: Kees Cook <keescook@chromium.org> Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--tools/testing/selftests/kselftest_harness.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h
index 5b0592e4b7a4..b643a577f9e1 100644
--- a/tools/testing/selftests/kselftest_harness.h
+++ b/tools/testing/selftests/kselftest_harness.h
@@ -1143,14 +1143,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)