diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-02-28 16:59:16 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2024-03-01 10:30:29 +0000 |
| commit | 42ab727eb95fcff83e7a67fcdbf467bbcd53451e (patch) | |
| tree | 8581d555cef159c2971a3cba46db7d2c9fc6f4af /tools | |
| parent | 732e2035280bf499a4b002677e2a1845f557d403 (diff) | |
| download | linux-42ab727eb95fcff83e7a67fcdbf467bbcd53451e.tar.gz | |
selftests: kselftest_harness: separate diagnostic message with # in ksft_test_result_code()
According to the spec we should always print a # if we add
a diagnostic message. Having the caller pass in the new line
as part of diagnostic message makes handling this a bit
counter-intuitive, so append the new line in the helper.
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/selftests/kselftest.h | 5 | ||||
| -rw-r--r-- | tools/testing/selftests/kselftest_harness.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tools/testing/selftests/kselftest.h b/tools/testing/selftests/kselftest.h index 25e29626566ec..541bf192e30e6 100644 --- a/tools/testing/selftests/kselftest.h +++ b/tools/testing/selftests/kselftest.h @@ -287,10 +287,15 @@ void ksft_test_result_code(int exit_code, const char *test_name, break; } + /* Docs seem to call for double space if directive is absent */ + if (!directive[0] && msg[0]) + directive = " # "; + va_start(args, msg); printf("%s %u %s%s", tap_code, ksft_test_num(), test_name, directive); errno = saved_errno; vprintf(msg, args); + printf("\n"); va_end(args); } diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h index 82377051aa541..5b0592e4b7a47 100644 --- a/tools/testing/selftests/kselftest_harness.h +++ b/tools/testing/selftests/kselftest_harness.h @@ -1148,7 +1148,7 @@ void __run_test(struct __fixture_metadata *f, if (t->exit_code == KSFT_SKIP) ksft_test_result_code(t->exit_code, test_name, - "%s\n", diagnostic); + "%s", diagnostic); else ksft_test_result(__test_passed(t), "%s\n", test_name); } |