lib: add a checked-attribute counter to sysfs assert helpers
PATCH v3 1/2 lib: add a checked-attribute counter to sysfs assert helpers
The TST_SYSFS_ASSERT_*_SILENT() assertions skip silently when the attribute does not exist. A test that only uses SILENT assertions can therefore finish without reporting a single result on machines where none of the probed attributes are present, which the library turns into:
tst_test.c:1730: TBROK: Test haven't reported results!
Add a counter that is bumped every time a SILENT assertion finds the attribute and actually checks it, regardless of whether the check passes or fails (failures produce TFAIL on their own). Tests can reset it at the start, then report a TPASS summary or a TCONF based on the final count.
--- include/tst_sysfs_assert.h | 11 +++++++++++ lib/tst_sysfs_assert.c | 29 ++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 3 deletions(-)
include/tst_sysfs_assert.h +11 -0
@@ -649,4 +649,15 @@ long tst_sysfs_read_li(const char *file, const int lineno,unsigned long tst_sysfs_read_lx (const char *file,const int lineno,const char *fmt, ...); +/** +* tst_sysfs_cnt_reset() - Reset the checked-attribute counter. +*/ +void tst_sysfs_cnt_reset (void ); + +/** +* tst_sysfs_cnt_get() - Number of attributes the *_SILENT assertions +* found and checked (pass or fail) since the last reset. +*/ +unsigned int tst_sysfs_cnt_get (void ); +#endif /* TST_SYSFS_ASSERT_H__ */
lib/tst_sysfs_assert.c +26 -3
@@ -15,6 +15,17 @@#include "tst_test.h" #include "tst_sysfs_assert.h" +static unsigned int tst_sysfs_cnt; + +static int silent_attr_exists (const char *path) +{ +if (access (path,F_OK )) +return 0 ; + + tst_sysfs_cnt++; +return 1 ; +} +static void build_path (char *path,size_t size,const char *fmt,va_list ap) {vsnprintf (path, size, fmt, ap);
@@ -95,7 +106,7 @@ void tst_sysfs_assert_rangell_silent(const char *file, const int lineno,build_path (path,sizeof (path), fmt, ap);va_end (ap); -if (access (path,F_OK )) +if (!silent_attr_exists (path))return ;range_check (file, lineno, path, min, max);
@@ -153,7 +164,7 @@ void tst_sysfs_assert_rangeuu_silent(const char *file, const int lineno,build_path (path,sizeof (path), fmt, ap);va_end (ap); -if (access (path,F_OK )) +if (!silent_attr_exists (path))return ;range_check_u (file, lineno, path, min, max);
@@ -239,7 +250,7 @@ void tst_sysfs_assert_bool_silent(const char *file, const int lineno,build_path (path,sizeof (path), fmt, ap);va_end (ap); -if (access (path,F_OK )) +if (!silent_attr_exists (path))return ;bool_check (file, lineno, path);
@@ -684,6 +695,8 @@ void tst_sysfs_assert_cmp_silent(const char *file, const int lineno,if (access (path1,F_OK ) ||access (path2,F_OK ))return ; + tst_sysfs_cnt++; +tst_sysfs_assert_cmp (file, lineno, path1, op, path2); }
@@ -869,3 +882,13 @@ unsigned long tst_sysfs_read_lx(const char *file, const int lineno,return val; } + +void tst_sysfs_cnt_reset (void ) +{ + tst_sysfs_cnt =0 ; +} + +unsigned int tst_sysfs_cnt_get (void ) +{ +return tst_sysfs_cnt; +}
Signature · 5 lines
2.56.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 2/2 sys_hwmon01: always report a result
On machines where the hwmon devices expose no checkable attributes (e.g. a VM or a laptop where hwmon0 is just 'ACAD' with nothing but a name attribute), every *_SILENT assertion skips silently and the test finishes without reporting a single result, which the library turns into:
tst_test.c:1730: TBROK: Test haven't reported results!
Fix this by using the new tst_sysfs_cnt_*() helpers to count the attributes that actually exist and get validated, then reporting a TPASS summary at the end, or TCONF when hwmon devices are present but expose nothing we can check.
While at it, fix a preexisting off-by-one in the inN channel loop:
probe in0..in31 so that all channel types probe exactly MAX_CHANNELS indices.
---
Notes:
v3:
- move the counter into the sysfs library as tst_sysfs_cnt_reset()/tst_sysfs_cnt_get(), drop the CHECK_* wrapper macros and the extra existence probe (Cyril)
v2:
- rename attr_exists() to sysfs_attr_exists() (Xiaochen)
- flatten the final result reporting with an early return (Xiaochen)
- fix a preexisting off-by-one in the inN channel loop (Xiaochen)
.../kernel/sysfs/class/hwmon/sys_hwmon01.c | 21 +++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
testcases/kernel/sysfs/class/hwmon/sys_hwmon01.c +17 -4
@@ -131,7 +131,7 @@ static void check_hwmon_device(const char *hwmon) PATH_CLASS_HWMON "/%s/update_interval", hwmon);/* inN channels are numbered from 0, per the hwmon ABI */ -for (i =0 ; i <=MAX_CHANNELS ; i++) +for (i =0 ; i <MAX_CHANNELS ; i++)check_in_channel (hwmon, i);for (i =1 ; i <=MAX_CHANNELS ; i++) {
@@ -147,7 +147,9 @@ static void do_test(void) {DIR *d;struct dirent *ent; -int found =0 ; +int devices =0 ; + +tst_sysfs_cnt_reset ();if (!tst_sysfs_exists (PATH_CLASS_HWMON ))tst_brk (TCONF ,PATH_CLASS_HWMON ": not present" );
@@ -158,14 +160,25 @@ static void do_test(void)if (strncmp (ent->d_name,"hwmon" ,5 ))continue ; - found =1 ; + devices++;check_hwmon_device (ent->d_name); }SAFE_CLOSEDIR (d); -if (!found) +if (!devices) {tst_res (TCONF ,"No hwmon device found" ); +return ; + } + +if (!tst_sysfs_cnt_get ()) { +tst_res (TCONF ,"%d hwmon devices present, but no checkable attributes" , + devices); +return ; + } + +tst_res (TPASS ,"Validated %u attributes on %d hwmon devices" , +tst_sysfs_cnt_get (), devices); }static struct tst_test test = {
Signature · 5 lines
2.56.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Quoted 6 lines
lib/tst_sysfs_assert.c +0
-0@@ -15,6 +15,17 @@#include "tst_test.h" #include "tst_sysfs_assert.h"
lib/tst_sysfs_assert.c line 27
Quoted 10 lines
lib/tst_sysfs_assert.c +10
-0+static unsigned int tst_sysfs_cnt; + +static int silent_attr_exists (const char *path) +{ +if (access (path,F_OK )) +return 0 ; + + tst_sysfs_cnt++; +return 1 ; +}
After sending out the patch, I realized that the silent_attr_exists() helper isn't really necessary — we can just add tst_sysfs_cnt++ directly in the silent functions.
So let me resend v4.
Signature · 5 lines
Regards, Li Wang -- Mailing list info: https://lists.linux.it/listinfo/ltp