selftests: harness: fix printing of mismatch values in __EXPECT()
Subsystems (2)
PATCH 1/1 selftests: harness: fix printing of mismatch values in __EXPECT()
intptr_t and uintptr_t are not big enough types on 32-bit architectures when printing 64-bit values, resulting to the following incorrect diagnostic output:
# get_syscall_info.c:209:get_syscall_info:Expected exp_args[2] (3134324433) == info.entry.args[1] (3134324433)
Replace intptr_t and uintptr_t with intmax_t and uintmax_t, respectively. With this fix, the same test produces more usable diagnostic output:
# get_syscall_info.c:209:get_syscall_info:Expected exp_args[2] (3134324433) == info.entry.args[1] (18446744072548908753)
--- tools/testing/selftests/kselftest_harness.h | 24 ++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-)
tools/testing/selftests/kselftest_harness.h +12 -12
@@ -760,33 +760,33 @@/* Report with actual signedness to avoid weird output. */ \switch (is_signed_type (__exp) *2 +is_signed_type (__seen)) { \case 0 : { \ -unsigned long long __exp_print = (uintptr_t )__exp; \ -unsigned long long __seen_print = (uintptr_t )__seen; \ -__TH_LOG ("Expected %s (%llu) %s %s (%llu)" , \ +uintmax_t __exp_print = (uintmax_t )__exp; \ +uintmax_t __seen_print = (uintmax_t )__seen; \ +__TH_LOG ("Expected %s (%ju) %s %s (%ju)" , \ _expected_str, __exp_print, #_t, \ _seen_str, __seen_print); \break ; \ } \case 1 : { \ -unsigned long long __exp_print = (uintptr_t )__exp; \ -long long __seen_print = (intptr_t )__seen; \ -__TH_LOG ("Expected %s (%llu) %s %s (%lld)" , \ +uintmax_t __exp_print = (uintmax_t )__exp; \ +intmax_t __seen_print = (intmax_t )__seen; \ +__TH_LOG ("Expected %s (%ju) %s %s (%jd)" , \ _expected_str, __exp_print, #_t, \ _seen_str, __seen_print); \break ; \ } \case 2 : { \ -long long __exp_print = (intptr_t )__exp; \ -unsigned long long __seen_print = (uintptr_t )__seen; \ -__TH_LOG ("Expected %s (%lld) %s %s (%llu)" , \ +intmax_t __exp_print = (intmax_t )__exp; \ +uintmax_t __seen_print = (uintmax_t )__seen; \ +__TH_LOG ("Expected %s (%jd) %s %s (%ju)" , \ _expected_str, __exp_print, #_t, \ _seen_str, __seen_print); \break ; \ } \case 3 : { \ -long long __exp_print = (intptr_t )__exp; \ -long long __seen_print = (intptr_t )__seen; \ -__TH_LOG ("Expected %s (%lld) %s %s (%lld)" , \ +intmax_t __exp_print = (intmax_t )__exp; \ +intmax_t __seen_print = (intmax_t )__seen; \ +__TH_LOG ("Expected %s (%jd) %s %s (%jd)" , \ _expected_str, __exp_print, #_t, \ _seen_str, __seen_print); \break ; \
Signature · 1 line
ldv
Quoted 6 lines · Dmitry V. Levin
intptr_tanduintptr_tare not big enough types on 32-bit architectures when printing 64-bit values, resulting to the following incorrect diagnostic output:# get_syscall_info.c:209:get_syscall_info:Expected exp_args[2] (3134324433) == info.entry.args[1] (3134324433)
Quoted 7 lines
Replace
intptr_tanduintptr_twithintmax_tanduintmax_t, respectively. With this fix, the same test produces more usable diagnostic output:# get_syscall_info.c:209:get_syscall_info:Expected exp_args[2] (3134324433) == info.entry.args[1] (18446744072548908753)
Fixes b5bb6d3068ea ("selftests/seccomp: fix 32-bit build warnings")Signed-off-by Dmitry V. Levin <[email protected]>
Ah nice, thanks!
Signature · 1 line
Kees Cook
Shuah Khan
maintainerQuoted 10 lines · Kees Cook
Quoted 9 lines · Dmitry V. Levin
intptr_tanduintptr_tare not big enough types on 32-bit architectures when printing 64-bit values, resulting to the following incorrect diagnostic output:# get_syscall_info.c:209:get_syscall_info:Expected exp_args[2] (3134324433) == info.entry.args[1] (3134324433)Replace
intptr_tanduintptr_twithintmax_tanduintmax_t, respectively. With this fix, the same test produces more usable diagnostic output:
Quoted 9 lines
Quoted 4 lines
# get_syscall_info.c:209:get_syscall_info:Expected exp_args[2] (3134324433) == info.entry.args[1] (18446744072548908753)Fixes b5bb6d3068ea ("selftests/seccomp: fix 32-bit build warnings")Signed-off-by Dmitry V. Levin <[email protected]>Ah nice, thanks!
Reviewed-by Kees Cook <[email protected]>
Thank you. Applied to linux-kselftest next for Linux 6.14-rc1.
thanks,
-- Shuah