From: Sebastien GODARD Date: Thu, 21 May 2020 08:40:03 +0000 (+0200) Subject: Update non regression tests X-Git-Tag: v12.4.0~41 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4466ef111679ed69617fef456442def69cb351f7;p=sysstat Update non regression tests Signed-off-by: Sebastien GODARD --- diff --git a/tests/01020 b/tests/01020 index 1ba9352..281ef61 100644 --- a/tests/01020 +++ b/tests/01020 @@ -2,5 +2,5 @@ rm -f tests/data1.tmp rm -f tests/root ln -s root6 tests/root -TZ=GMT ./sadc --unix_time=1555593609 -S A_NULL,A_PSI_CPU tests/data1.tmp 1 1 2>&1 | grep "Requested activities not available" +LC_ALL=C TZ=GMT ./sadc --unix_time=1555593609 -S A_NULL,A_PSI_CPU tests/data1.tmp 1 1 2>&1 | grep "Requested activities not available" diff --git a/tests/02696 b/tests/02696 new file mode 100644 index 0000000..f67a5d0 --- /dev/null +++ b/tests/02696 @@ -0,0 +1,3 @@ +rm -f tests/root +ln -s root1 tests/root +LC_ALL=C TZ=GMT ./iostat -g other sda9 sda12 -g total -p ALL 1 2 > tests/out2.iostat-gpALL.tmp diff --git a/tests/02697 b/tests/02697 new file mode 100644 index 0000000..c59641e --- /dev/null +++ b/tests/02697 @@ -0,0 +1 @@ +diff -u tests/out2.iostat-gpALL.tmp tests/expected2.iostat-gpALL diff --git a/tests/02698 b/tests/02698 new file mode 100644 index 0000000..d3ca6b2 --- /dev/null +++ b/tests/02698 @@ -0,0 +1,4 @@ +rm -f tests/root +ln -s root1 tests/root +# -p ALL should not be used before a list of devices +LC_ALL=C TZ=GMT ./iostat -g total -p ALL -g other sda9 sda12 1 2 > tests/out3.iostat-gpALL.tmp diff --git a/tests/02699 b/tests/02699 new file mode 100644 index 0000000..0d98898 --- /dev/null +++ b/tests/02699 @@ -0,0 +1 @@ +diff -u tests/out3.iostat-gpALL.tmp tests/expected3.iostat-gpALL diff --git a/tests/TLIST b/tests/TLIST index 667bf8c..f7a1f24 100644 --- a/tests/TLIST +++ b/tests/TLIST @@ -220,7 +220,7 @@ NOTES: 01010 4 x TZ=GMT ./sadc --unix_time=xxxxxxx tests/data1.tmp 1 1 >/dev/null 01012 LC_ALL=C TZ=GMT ./sar -f tests/data1.tmp -q ALL > tests/out2.sar-qALL.tmp 01014 diff -u tests/out2.sar-qALL.tmp tests/expected2.sar-qALL -01020 TZ=GMT ./sadc --unix_time=1555593609 -S A_NULL,A_PSI_CPU tests/data1.tmp 1 1 2>&1 | grep "Requested activities not available" +01020 LC_ALL=C TZ=GMT ./sadc --unix_time=1555593609 -S A_NULL,A_PSI_CPU tests/data1.tmp 1 1 2>&1 | grep "Requested activities not available" ===== sar/sadf: Reading data0.tmp 01100 LC_ALL=C TZ=GMT ./sar -A -f tests/data0.tmp > tests/out0.sar-A.tmp @@ -442,6 +442,10 @@ NOTES: 02685 diff -u tests/out.iostat-gALL.tmp tests/expected.iostat-gALL 02690 LC_ALL=C TZ=GMT ./iostat -g total -p ALL 1 2 > tests/out.iostat-gpALL.tmp 02695 diff -u tests/out.iostat-gpALL.tmp tests/expected.iostat-gpALL +02696 LC_ALL=C TZ=GMT ./iostat -g other sda9 sda12 -g total -p ALL 1 2 > tests/out2.iostat-gpALL.tmp +02697 diff -u tests/out2.iostat-gpALL.tmp tests/expected2.iostat-gpALL +02698 LC_ALL=C TZ=GMT ./iostat -g total -p ALL -g other sda9 sda12 1 2 > tests/out3.iostat-gpALL.tmp +02699 diff -u tests/out3.iostat-gpALL.tmp tests/expected3.iostat-gpALL 02700 LC_ALL=C TZ=GMT ./iostat -g total -p sda 1 2 > tests/out.iostat-gp.tmp 02705 diff -u tests/out.iostat-gp.tmp tests/expected.iostat-gp 02710 LC_ALL=C TZ=GMT ./iostat -g total -p sda -y 1 3 > tests/out.iostat-gpy.tmp diff --git a/tests/expected2.iostat-gpALL b/tests/expected2.iostat-gpALL new file mode 100644 index 0000000..8ad9347 --- /dev/null +++ b/tests/expected2.iostat-gpALL @@ -0,0 +1,55 @@ +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) + +avg-cpu: %user %nice %system %iowait %steal %idle + 1.65 44.90 1.84 1.01 0.00 50.60 + +Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd +sda9 6.60 193.17 19.89 0.00 1389369 143040 0 +sda12 1.88 25.28 37.19 0.00 181825 267480 0 + other 8.48 218.45 57.08 0.00 1571194 410520 0 +sda 8.59 222.14 57.08 0.00 1597749 410544 0 +sda1 0.01 0.29 0.00 0.00 2108 0 0 +sda2 0.01 0.29 0.00 0.00 2092 0 0 +sda3 0.01 0.29 0.00 0.00 2100 0 0 +sda4 0.00 0.00 0.00 0.00 14 0 0 +sda5 0.01 0.31 0.00 0.00 2252 0 0 +sda6 0.02 0.62 0.00 0.00 4424 12 0 +sda7 0.02 0.62 0.00 0.00 4437 12 0 +sda8 0.01 0.34 0.00 0.00 2444 0 0 +sda10 0.01 0.31 0.00 0.00 2220 0 0 +sda11 0.01 0.31 0.00 0.00 2252 0 0 +scd0 0.00 0.00 0.00 0.00 0 0 0 +sdb 0.01 0.29 0.00 0.00 2108 0 0 +sde 0.00 0.00 0.00 0.00 0 0 0 +sdc 0.00 0.00 0.00 0.00 0 0 0 +sdd 0.00 0.00 0.00 0.00 0 0 0 +dm-2 0.00 0.00 0.00 0.00 0 0 0 + total 8.68 225.82 57.08 0.00 1624200 410568 0 + + +avg-cpu: %user %nice %system %iowait %steal %idle + 2.15 12.50 2.35 0.12 0.00 82.89 + +Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd +sda9 0.00 0.00 0.00 0.00 0 0 0 +sda12 0.00 0.00 0.00 0.00 0 0 0 + other 0.00 0.00 0.00 0.00 0 0 0 +sda 0.00 0.00 0.00 0.00 0 0 0 +sda1 0.00 0.00 0.00 0.00 0 0 0 +sda2 0.00 0.00 0.00 0.00 0 0 0 +sda3 0.00 0.00 0.00 0.00 0 0 0 +sda4 0.00 0.00 0.00 0.00 0 0 0 +sda5 0.00 0.00 0.00 0.00 0 0 0 +sda6 0.00 0.00 0.00 0.00 0 0 0 +sda7 0.00 0.00 0.00 0.00 0 0 0 +sda8 0.00 0.00 0.00 0.00 0 0 0 +sda10 0.00 0.00 0.00 0.00 0 0 0 +sda11 0.00 0.00 0.00 0.00 0 0 0 +scd0 0.00 0.00 0.00 0.00 0 0 0 +sdb 0.00 0.00 0.00 0.00 0 0 0 +sde 0.00 0.00 0.00 0.00 0 0 0 +sdc 0.00 0.00 0.00 0.00 0 0 0 +sdd 0.00 0.00 0.00 0.00 0 0 0 + total 0.00 0.00 0.00 0.00 0 0 0 + + diff --git a/tests/expected3.iostat-gpALL b/tests/expected3.iostat-gpALL new file mode 100644 index 0000000..1894f60 --- /dev/null +++ b/tests/expected3.iostat-gpALL @@ -0,0 +1,55 @@ +Linux 1.2.3-TEST (SYSSTAT.TEST) 01/01/70 _x86_64_ (8 CPU) + +avg-cpu: %user %nice %system %iowait %steal %idle + 1.65 44.90 1.84 1.01 0.00 50.60 + +Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd + total 0.00 0.00 0.00 0.00 0 0 0 +sda9 6.60 193.17 19.89 0.00 1389369 143040 0 +sda12 1.88 25.28 37.19 0.00 181825 267480 0 +sda 8.59 222.14 57.08 0.00 1597749 410544 0 +sda1 0.01 0.29 0.00 0.00 2108 0 0 +sda2 0.01 0.29 0.00 0.00 2092 0 0 +sda3 0.01 0.29 0.00 0.00 2100 0 0 +sda4 0.00 0.00 0.00 0.00 14 0 0 +sda5 0.01 0.31 0.00 0.00 2252 0 0 +sda6 0.02 0.62 0.00 0.00 4424 12 0 +sda7 0.02 0.62 0.00 0.00 4437 12 0 +sda8 0.01 0.34 0.00 0.00 2444 0 0 +sda10 0.01 0.31 0.00 0.00 2220 0 0 +sda11 0.01 0.31 0.00 0.00 2252 0 0 +scd0 0.00 0.00 0.00 0.00 0 0 0 +sdb 0.01 0.29 0.00 0.00 2108 0 0 +sde 0.00 0.00 0.00 0.00 0 0 0 +sdc 0.00 0.00 0.00 0.00 0 0 0 +sdd 0.00 0.00 0.00 0.00 0 0 0 +dm-2 0.00 0.00 0.00 0.00 0 0 0 + other 17.16 444.26 114.16 0.00 3195394 821088 0 + + +avg-cpu: %user %nice %system %iowait %steal %idle + 2.15 12.50 2.35 0.12 0.00 82.89 + +Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd + total 0.00 0.00 0.00 0.00 0 0 0 +sda9 0.00 0.00 0.00 0.00 0 0 0 +sda12 0.00 0.00 0.00 0.00 0 0 0 +sda 0.00 0.00 0.00 0.00 0 0 0 +sda1 0.00 0.00 0.00 0.00 0 0 0 +sda2 0.00 0.00 0.00 0.00 0 0 0 +sda3 0.00 0.00 0.00 0.00 0 0 0 +sda4 0.00 0.00 0.00 0.00 0 0 0 +sda5 0.00 0.00 0.00 0.00 0 0 0 +sda6 0.00 0.00 0.00 0.00 0 0 0 +sda7 0.00 0.00 0.00 0.00 0 0 0 +sda8 0.00 0.00 0.00 0.00 0 0 0 +sda10 0.00 0.00 0.00 0.00 0 0 0 +sda11 0.00 0.00 0.00 0.00 0 0 0 +scd0 0.00 0.00 0.00 0.00 0 0 0 +sdb 0.00 0.00 0.00 0.00 0 0 0 +sde 0.00 0.00 0.00 0.00 0 0 0 +sdc 0.00 0.00 0.00 0.00 0 0 0 +sdd 0.00 0.00 0.00 0.00 0 0 0 + other 0.00 0.00 0.00 0.00 0 0 0 + +