From: Edward Liaw <edliaw@google.com>
To: stable@vger.kernel.org, Shuah Khan <shuah@kernel.org>
Cc: kernel-team@android.com, Mark Brown <broonie@kernel.org>,
Kees Cook <keescook@chromium.org>,
Shuah Khan <skhan@linuxfoundation.org>,
linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] kselftest: Add a ksft_perror() helper
Date: Mon, 29 Apr 2024 18:05:14 -0700 [thread overview]
Message-ID: <CAG4es9VDsiWdhAHuBkS-+GkQeW+m5DeJC0mdDLEmOh1PDfQBdw@mail.gmail.com> (raw)
In-Reply-To: <20240430004909.425336-1-edliaw@google.com>
Sorry, will resend this; I forgot to prefix that it was intended for
the 6.6.y branch.
On Mon, Apr 29, 2024 at 5:49 PM Edward Liaw <edliaw@google.com> wrote:
>
> From: Mark Brown <broonie@kernel.org>
>
> [ Upstream commit 907f33028871fa7c9a3db1efd467b78ef82cce20 ]
>
> The standard library perror() function provides a convenient way to print
> an error message based on the current errno but this doesn't play nicely
> with KTAP output. Provide a helper which does an equivalent thing in a KTAP
> compatible format.
>
> nolibc doesn't have a strerror() and adding the table of strings required
> doesn't seem like a good fit for what it's trying to do so when we're using
> that only print the errno.
>
> Signed-off-by: Mark Brown <broonie@kernel.org>
> Reviewed-by: Kees Cook <keescook@chromium.org>
> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
> Stable-dep-of: 071af0c9e582 ("selftests: timers: Convert posix_timers test to generate KTAP output")
> Signed-off-by: Edward Liaw <edliaw@google.com>
> ---
> tools/testing/selftests/kselftest.h | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/tools/testing/selftests/kselftest.h b/tools/testing/selftests/kselftest.h
> index e8eecbc83a60..ad7b97e16f37 100644
> --- a/tools/testing/selftests/kselftest.h
> +++ b/tools/testing/selftests/kselftest.h
> @@ -48,6 +48,7 @@
> #include <stdlib.h>
> #include <unistd.h>
> #include <stdarg.h>
> +#include <string.h>
> #include <stdio.h>
> #include <sys/utsname.h>
> #endif
> @@ -156,6 +157,19 @@ static inline void ksft_print_msg(const char *msg, ...)
> va_end(args);
> }
>
> +static inline void ksft_perror(const char *msg)
> +{
> +#ifndef NOLIBC
> + ksft_print_msg("%s: %s (%d)\n", msg, strerror(errno), errno);
> +#else
> + /*
> + * nolibc doesn't provide strerror() and it seems
> + * inappropriate to add one, just print the errno.
> + */
> + ksft_print_msg("%s: %d)\n", msg, errno);
> +#endif
> +}
> +
> static inline void ksft_test_result_pass(const char *msg, ...)
> {
> int saved_errno = errno;
> --
> 2.44.0.769.g3c40516874-goog
>
prev parent reply other threads:[~2024-04-30 1:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-30 0:49 [PATCH] kselftest: Add a ksft_perror() helper Edward Liaw
2024-04-30 1:05 ` Edward Liaw [this message]
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=CAG4es9VDsiWdhAHuBkS-+GkQeW+m5DeJC0mdDLEmOh1PDfQBdw@mail.gmail.com \
--to=edliaw@google.com \
--cc=broonie@kernel.org \
--cc=keescook@chromium.org \
--cc=kernel-team@android.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=shuah@kernel.org \
--cc=skhan@linuxfoundation.org \
--cc=stable@vger.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).