kselftest: Add a ksft_perror() helper
Subsystems (2)
PATCH 1/1 kselftest: Add a ksft_perror() helper
From: Mark Brown <[email protected]>
[ 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.
Stable-dep-of: 071af0c9e582 ("selftests: timers: Convert posix_timers test to generate KTAP output")
--- tools/testing/selftests/kselftest.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
tools/testing/selftests/kselftest.h +14 -0
@@ -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;
Signature · 1 line
2.44.0.769.g3c40516874-goog
Sorry, will resend this; I forgot to prefix that it was intended for the 6.6.y branch.
Quoted 58 lines · Edward Liaw
From: Mark Brown <[email protected]>
[ 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 <[email protected]>Reviewed-by Kees Cook <[email protected]>Signed-off-by Shuah Khan <[email protected]>Stable-dep-of:
071af0c9e582("selftests: timers: Convertposix_timerstest to generate KTAP output")Signed-off-by Edward Liaw <[email protected]>--- tools/testing/selftests/kselftest.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+)tools/testing/selftests/kselftest.h +14
-1@@ -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