selftests: kselftest_harness: separate diagnostic message with # in ksft_test_result_...

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>

diff --git a/tools/testing/selftests/kselftest.h b/tools/testing/selftests/kselftest.h
index 25e29626566eca44c9a55132783e4956d20ebda9..541bf192e30e6bcec377908643d41d1d1dbf765a 100644 (file)
--- 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 82377051aa54135136c36ff105bf23ad6ba4923c..5b0592e4b7a47fb2978cf4f67f2938ba58a964e9 100644 (file)
--- 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);
 }