From aa92d7ec14367325c45955465204b27190e3800c Mon Sep 17 00:00:00 2001 From: Sebastien GODARD Date: Fri, 26 Apr 2019 17:21:01 +0200 Subject: [PATCH] simtest: Don't collect sensors statistics The statistics will depend on the host where the tests are run. So don't collect them. They also should not appear in datafile header displayed by sadf -H. Signed-off-by: Sebastien GODARD --- tests/00100 | 2 +- tests/TLIST | 4 ++-- tests/expected.sadf-H | 5 +---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/tests/00100 b/tests/00100 index 972797b..26445de 100644 --- a/tests/00100 +++ b/tests/00100 @@ -2,7 +2,7 @@ rm -f tests/data.tmp rm -f tests/root ln -s root1 tests/root -./sadc --unix_time=1555593609 -S XALL tests/data.tmp 1 1 >/dev/null +./sadc --unix_time=1555593609 -S XALL,-A_PWR_FAN,-A_PWR_IN,-A_PWR_TEMP tests/data.tmp 1 1 >/dev/null rm -f tests/root ln -s root2 tests/root diff --git a/tests/TLIST b/tests/TLIST index 2127fde..6ee50f9 100644 --- a/tests/TLIST +++ b/tests/TLIST @@ -9,7 +9,7 @@ 00017 ./cifsiostat -V >/dev/null ===== Creating data.tmp -00100 5 x ./sadc --unix_time=XXXXXXXXX -S XALL tests/data.tmp 1 1 >/dev/null +00100 5 x ./sadc --unix_time=XXXXXXXXX -S XALL,-A_PWR_FAN,-A_PWR_IN,-A_PWR_TEMP tests/data.tmp 1 1 >/dev/null 00110 ./sadc --unix_time=XXXXXXXXX tests/data.tmp 00120 ./sadc --unix_time=1555594749 -C "Testing sysstat!" tests/data.tmp @@ -51,7 +51,7 @@ 00531 diff -u tests/out.sadf-j.tmp tests/expected.sadf-j 00540 ./sadf -g tests/data.tmp -C -- -bBdFHqSvwWy -I SUM -I ALL -m CPU -n ALL -r ALL -u ALL -P ALL > tests/out.sadf-g.tmp 00541 diff -u tests/out.sadf-g.tmp tests/expected.sadf-g -00550 ./sadf -g -O autoscale,packed,oneday,showidle,showtoc,skipempty,showinfo,bwcol tests/data.tmp -T -C -- -bBdFHqSvwWy -I SUM -I ALL -m CPU -n ALL -r ALL -u ALL -P ALL > tests/out2.sadf-g.tmp +00550 TZ=GMT ./sadf -g -O autoscale,packed,oneday,showidle,showtoc,skipempty,showinfo,bwcol tests/data.tmp -T -C -- -bBdFHqSvwWy -I SUM -I ALL -m CPU -n ALL -r ALL -u ALL -P ALL > tests/out2.sadf-g.tmp 00551 diff -u tests/out2.sadf-g2.tmp tests/expected2.sadf-g2 00560 ./sadf -H tests/data.tmp > tests/out.sadf-H.tmp 00561 diff -u tests/out.sadf-H.tmp tests/expected.sadf-H diff --git a/tests/expected.sadf-H b/tests/expected.sadf-H index 4b29c4e..b3a4051 100644 --- a/tests/expected.sadf-H +++ b/tests/expected.sadf-H @@ -7,7 +7,7 @@ File time: 13:20:09 UTC File composition: (1,1,11),(0,0,9),(2,0,0) Size of a long int: 8 HZ = 100 -Number of activities in file: 37 +Number of activities in file: 34 List of activities: 01: [8b] A_CPU Y: 9 (10,0,0) 02: [8b] A_PCSW N: 1 (1,1,0) @@ -42,7 +42,4 @@ List of activities: 38: [8a] A_NET_FC Y: 1 (0,4,0) 39: [8a] A_NET_SOFT Y: 9 (0,0,5) 30: [8a] A_PWR_CPU Y: 9 (0,1,0) -31: [8a] A_PWR_FAN Y: 4 (2,0,0) -32: [8a] A_PWR_TEMP Y: 9 (3,0,0) -33: [8a] A_PWR_IN Y: 4 (3,0,0) 37: [8b] A_FS Y: 4 (5,0,0) -- 2.40.0