sys_hwmon01: always report a result
PATCH 1/1 sys_hwmon01: always report a result
On machines where the only hwmon devices expose no checkable attributes (e.g. a VM or 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 counting the attributes that actually exist and get validated, then report a TPASS summary at the end, or TCONF when hwmon devices are present but expose nothing we can check.
Signed-off-by Li Wang (Hieco) <[email protected]>
--- .../kernel/sysfs/class/hwmon/sys_hwmon01.c | 109 ++++++++++++------ 1 file changed, 76 insertions(+), 33 deletions(-)
testcases/kernel/sysfs/class/hwmon/sys_hwmon01.c +76 -33
@@ -49,6 +49,8 @@#include <string.h> #include <dirent.h> +#include <stdarg.h> +#include <limits.h> #include "tst_test.h" #include "tst_sysfs_assert.h"
@@ -56,39 +58,67 @@#define MAX_CHANNELS 32 +static unsigned int checked; + +static int attr_exists (const char *fmt, ...) +{ +char path[PATH_MAX ]; +va_list va; + +va_start (va, fmt); +vsnprintf (path,sizeof (path), fmt, va); +va_end (va); + +return tst_sysfs_exists (path); +} + +#define CHECK_RANGELL (lo, hi, ...) do { \ + if (attr_exists(__VA_ARGS__)) { \ + checked++; \ + TST_SYSFS_ASSERT_RANGELL_SILENT(lo, hi, __VA_ARGS__); \ + } \ +} while (0) + +#define CHECK_BOOL (...) do { \ + if (attr_exists(__VA_ARGS__)) { \ + checked++; \ + TST_SYSFS_ASSERT_BOOL_SILENT(__VA_ARGS__); \ + } \ +} while (0) +static void check_temp_channel (const char *hwmon,int idx) { -TST_SYSFS_ASSERT_RANGELL_SILENT (-55000 ,200000 , -PATH_CLASS_HWMON "/%s/temp%d_input" , hwmon, idx); - -TST_SYSFS_ASSERT_BOOL_SILENT (PATH_CLASS_HWMON "/%s/temp%d_alarm" , hwmon, idx); -TST_SYSFS_ASSERT_BOOL_SILENT (PATH_CLASS_HWMON "/%s/temp%d_crit_alarm" , hwmon, idx); -TST_SYSFS_ASSERT_BOOL_SILENT (PATH_CLASS_HWMON "/%s/temp%d_min_alarm" , hwmon, idx); -TST_SYSFS_ASSERT_BOOL_SILENT (PATH_CLASS_HWMON "/%s/temp%d_max_alarm" , hwmon, idx); -TST_SYSFS_ASSERT_BOOL_SILENT (PATH_CLASS_HWMON "/%s/temp%d_fault" , hwmon, idx); +CHECK_RANGELL (-55000 ,200000 , +PATH_CLASS_HWMON "/%s/temp%d_input" , hwmon, idx); + +CHECK_BOOL (PATH_CLASS_HWMON "/%s/temp%d_alarm" , hwmon, idx); +CHECK_BOOL (PATH_CLASS_HWMON "/%s/temp%d_crit_alarm" , hwmon, idx); +CHECK_BOOL (PATH_CLASS_HWMON "/%s/temp%d_min_alarm" , hwmon, idx); +CHECK_BOOL (PATH_CLASS_HWMON "/%s/temp%d_max_alarm" , hwmon, idx); +CHECK_BOOL (PATH_CLASS_HWMON "/%s/temp%d_fault" , hwmon, idx); }static void check_fan_channel (const char *hwmon,int idx) { -TST_SYSFS_ASSERT_RANGELL_SILENT (0 ,100000 , -PATH_CLASS_HWMON "/%s/fan%d_input" , hwmon, idx); +CHECK_RANGELL (0 ,100000 , +PATH_CLASS_HWMON "/%s/fan%d_input" , hwmon, idx); -TST_SYSFS_ASSERT_BOOL_SILENT (PATH_CLASS_HWMON "/%s/fan%d_alarm" , hwmon, idx); -TST_SYSFS_ASSERT_BOOL_SILENT (PATH_CLASS_HWMON "/%s/fan%d_min_alarm" , hwmon, idx); -TST_SYSFS_ASSERT_BOOL_SILENT (PATH_CLASS_HWMON "/%s/fan%d_max_alarm" , hwmon, idx); -TST_SYSFS_ASSERT_BOOL_SILENT (PATH_CLASS_HWMON "/%s/fan%d_fault" , hwmon, idx); +CHECK_BOOL (PATH_CLASS_HWMON "/%s/fan%d_alarm" , hwmon, idx); +CHECK_BOOL (PATH_CLASS_HWMON "/%s/fan%d_min_alarm" , hwmon, idx); +CHECK_BOOL (PATH_CLASS_HWMON "/%s/fan%d_max_alarm" , hwmon, idx); +CHECK_BOOL (PATH_CLASS_HWMON "/%s/fan%d_fault" , hwmon, idx); }static void check_in_channel (const char *hwmon,int idx) { -TST_SYSFS_ASSERT_RANGELL_SILENT (-100000 ,100000 , -PATH_CLASS_HWMON "/%s/in%d_input" , hwmon, idx); - -TST_SYSFS_ASSERT_BOOL_SILENT (PATH_CLASS_HWMON "/%s/in%d_alarm" , hwmon, idx); -TST_SYSFS_ASSERT_BOOL_SILENT (PATH_CLASS_HWMON "/%s/in%d_min_alarm" , hwmon, idx); -TST_SYSFS_ASSERT_BOOL_SILENT (PATH_CLASS_HWMON "/%s/in%d_max_alarm" , hwmon, idx); -TST_SYSFS_ASSERT_BOOL_SILENT (PATH_CLASS_HWMON "/%s/in%d_crit_alarm" , hwmon, idx); -TST_SYSFS_ASSERT_BOOL_SILENT (PATH_CLASS_HWMON "/%s/in%d_lcrit_alarm" , hwmon, idx); +CHECK_RANGELL (-100000 ,100000 , +PATH_CLASS_HWMON "/%s/in%d_input" , hwmon, idx); + +CHECK_BOOL (PATH_CLASS_HWMON "/%s/in%d_alarm" , hwmon, idx); +CHECK_BOOL (PATH_CLASS_HWMON "/%s/in%d_min_alarm" , hwmon, idx); +CHECK_BOOL (PATH_CLASS_HWMON "/%s/in%d_max_alarm" , hwmon, idx); +CHECK_BOOL (PATH_CLASS_HWMON "/%s/in%d_crit_alarm" , hwmon, idx); +CHECK_BOOL (PATH_CLASS_HWMON "/%s/in%d_lcrit_alarm" , hwmon, idx); }static void check_curr_channel (const char *hwmon,int idx)
@@ -97,10 +127,10 @@ static void check_curr_channel(const char *hwmon, int idx)* Unlike fan/power, current can be negative on bidirectional sensors, * e.g. a battery charge/discharge current monitor. */ -TST_SYSFS_ASSERT_RANGELL_SILENT (-500000 ,500000 , -PATH_CLASS_HWMON "/%s/curr%d_input" , hwmon, idx); +CHECK_RANGELL (-500000 ,500000 , +PATH_CLASS_HWMON "/%s/curr%d_input" , hwmon, idx); -TST_SYSFS_ASSERT_BOOL_SILENT (PATH_CLASS_HWMON "/%s/curr%d_alarm" , hwmon, idx); +CHECK_BOOL (PATH_CLASS_HWMON "/%s/curr%d_alarm" , hwmon, idx); }static void check_power_channel (const char *hwmon,int idx)
@@ -110,13 +140,13 @@ static void check_power_channel(const char *hwmon, int idx)* sensor (CPU, GPU, PSU rail, ...) while still fitting within * LONG_MAX on 32bit architectures. */ -TST_SYSFS_ASSERT_RANGELL_SILENT (0 ,2000000000 , -PATH_CLASS_HWMON "/%s/power%d_input" , hwmon, idx); +CHECK_RANGELL (0 ,2000000000 , +PATH_CLASS_HWMON "/%s/power%d_input" , hwmon, idx); }static void check_pwm_channel (const char *hwmon,int idx) { -TST_SYSFS_ASSERT_RANGELL_SILENT (0 ,255 ,PATH_CLASS_HWMON "/%s/pwm%d" , hwmon, idx); +CHECK_RANGELL (0 ,255 ,PATH_CLASS_HWMON "/%s/pwm%d" , hwmon, idx); }static void check_hwmon_device (const char *hwmon)
@@ -127,8 +157,8 @@ static void check_hwmon_device(const char *hwmon)if (TST_SYSFS_READ_STR (name,sizeof (name),PATH_CLASS_HWMON "/%s/name" , hwmon))tst_res (TINFO ,"%s: name = '%s'" , hwmon, name); -TST_SYSFS_ASSERT_RANGELL_SILENT (1 ,3600000 , -PATH_CLASS_HWMON "/%s/update_interval" , hwmon); +CHECK_RANGELL (1 ,3600000 , +PATH_CLASS_HWMON "/%s/update_interval" , hwmon);/* inN channels are numbered from 0, per the hwmon ABI */ for (i =0 ; i <=MAX_CHANNELS ; i++)
@@ -147,7 +177,9 @@ static void do_test(void) {DIR *d;struct dirent *ent; -int found =0 ; +int devices =0 ; + + checked =0 ;if (!tst_sysfs_exists (PATH_CLASS_HWMON ))tst_brk (TCONF ,PATH_CLASS_HWMON ": not present" );
@@ -158,14 +190,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 (checked) { +tst_res (TPASS ,"Validated %u attributes on %d hwmon devices" , + checked, devices); + }else { +tst_res (TCONF , +"%d hwmon devices present, but no checkable attributes" , + devices); + } }static struct tst_test test = {
Signature · 5 lines
2.56.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp