| Message ID | 20240430004909.425336-1-edliaw@google.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | kselftest: Add a ksft_perror() helper | expand |
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 >
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;