From: Sean Christopherson <seanjc@google.com>
To: Kees Cook <keescook@chromium.org>, Shuah Khan <shuah@kernel.org>,
Nathan Chancellor <nathan@kernel.org>
Cc: linux-kselftest@vger.kernel.org, llvm@lists.linux.dev,
linux-kernel@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>,
Sean Christopherson <seanjc@google.com>
Subject: [PATCH] selftests: kselftest_harness: Print empty string, not empty fmt on PASS/FAIL
Date: Tue, 9 Apr 2024 15:42:56 -0700 [thread overview]
Message-ID: <20240409224256.1581292-1-seanjc@google.com> (raw)
When printing nothing for the diagnostic on PASS/FAIL, use a string format
with an empty string, not an empty format with a NULL parameter. Clang
complains about the empty format string, which in turn breaks building
with -Werror.
../kselftest_harness.h:1205:30: error: format string is empty [-Werror,-Wformat-zero-length]
diagnostic ? "%s" : "", diagnostic);
^~
Fixes: 378193eff339 ("selftests: kselftest_harness: let PASS / FAIL provide diagnostic")
Cc: Kees Cook <keescook@chromium.org>
Cc: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
tools/testing/selftests/kselftest_harness.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/kselftest_harness.h b/tools/testing/selftests/kselftest_harness.h
index 4fd735e48ee7..79ac9e9ada33 100644
--- a/tools/testing/selftests/kselftest_harness.h
+++ b/tools/testing/selftests/kselftest_harness.h
@@ -1197,12 +1197,11 @@ 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;
+ diagnostic = "";
else
diagnostic = "unknown";
- ksft_test_result_code(t->exit_code, test_name,
- diagnostic ? "%s" : "", diagnostic);
+ ksft_test_result_code(t->exit_code, test_name, "%s", diagnostic);
}
static int test_harness_run(int argc, char **argv)
base-commit: 2c71fdf02a95b3dd425b42f28fd47fb2b1d22702
--
2.44.0.478.gd926399ef9-goog
next reply other threads:[~2024-04-09 22:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-09 22:42 Sean Christopherson [this message]
2024-04-09 23:09 ` [PATCH] selftests: kselftest_harness: Print empty string, not empty fmt on PASS/FAIL Jakub Kicinski
2024-04-09 23:46 ` Kees Cook
2024-04-09 23:53 ` Jakub Kicinski
2024-04-10 0:14 ` Sean Christopherson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240409224256.1581292-1-seanjc@google.com \
--to=seanjc@google.com \
--cc=keescook@chromium.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=nathan@kernel.org \
--cc=shuah@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox