| Message ID | 20250209-nolibc-scanf-v2-2-c29dea32f1cd@weissschuh.net (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | tools/nolibc: add support for [v]sscanf() | expand |
On 2/9/25 13:27, Thomas Weißschuh wrote: > This reverts commit 16767502aa990cca2cb7d1372b31d328c4c85b40. > > Nolibc gained support for uname(2) and sscanf(3) which are the > dependencies of ksft_min_kernel_version(). > > So re-enable support for ksft_min_kernel_version() under nolibc. > > Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> > --- > tools/testing/selftests/kselftest.h | 5 ----- > 1 file changed, 5 deletions(-) > > diff --git a/tools/testing/selftests/kselftest.h b/tools/testing/selftests/kselftest.h > index cdf91b0ca40fbdc4fb825b86d4dc547b5afa673c..c3b6d2604b1e486af5a224a11386f75fe0a83495 100644 > --- a/tools/testing/selftests/kselftest.h > +++ b/tools/testing/selftests/kselftest.h > @@ -444,10 +444,6 @@ static inline __noreturn __printf(1, 2) void ksft_exit_skip(const char *msg, ... > static inline int ksft_min_kernel_version(unsigned int min_major, > unsigned int min_minor) > { > -#ifdef NOLIBC > - ksft_print_msg("NOLIBC: Can't check kernel version: Function not implemented\n"); > - return 0; > -#else > unsigned int major, minor; > struct utsname info; > > @@ -455,7 +451,6 @@ static inline int ksft_min_kernel_version(unsigned int min_major, > ksft_exit_fail_msg("Can't parse kernel version\n"); > > return major > min_major || (major == min_major && minor >= min_minor); > -#endif > } > > #endif /* __KSELFTEST_H */ > Looks good to me. Acked-by: Shuah Khan <skhan@linuxfoundation.org> thanks, -- Shuah
diff --git a/tools/testing/selftests/kselftest.h b/tools/testing/selftests/kselftest.h index cdf91b0ca40fbdc4fb825b86d4dc547b5afa673c..c3b6d2604b1e486af5a224a11386f75fe0a83495 100644 --- a/tools/testing/selftests/kselftest.h +++ b/tools/testing/selftests/kselftest.h @@ -444,10 +444,6 @@ static inline __noreturn __printf(1, 2) void ksft_exit_skip(const char *msg, ... static inline int ksft_min_kernel_version(unsigned int min_major, unsigned int min_minor) { -#ifdef NOLIBC - ksft_print_msg("NOLIBC: Can't check kernel version: Function not implemented\n"); - return 0; -#else unsigned int major, minor; struct utsname info; @@ -455,7 +451,6 @@ static inline int ksft_min_kernel_version(unsigned int min_major, ksft_exit_fail_msg("Can't parse kernel version\n"); return major > min_major || (major == min_major && minor >= min_minor); -#endif } #endif /* __KSELFTEST_H */
This reverts commit 16767502aa990cca2cb7d1372b31d328c4c85b40. Nolibc gained support for uname(2) and sscanf(3) which are the dependencies of ksft_min_kernel_version(). So re-enable support for ksft_min_kernel_version() under nolibc. Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> --- tools/testing/selftests/kselftest.h | 5 ----- 1 file changed, 5 deletions(-)