iostat: Update non regression tests

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>

diff --git a/tests/02613 b/tests/02613
new file mode 100644 (file)
index 0000000..b6342d6
--- /dev/null
+++ b/tests/02613
@@ -0,0 +1,3 @@
+rm -f tests/root
+ln -s root1 tests/root
+LC_ALL=C TZ=GMT ./iostat -x --pretty > tests/out.iostat-x-pretty.tmp && diff -u tests/expected.iostat-x-pretty tests/out.iostat-x-pretty.tmp

diff --git a/tests/02615 b/tests/02615
new file mode 100644 (file)
index 0000000..ecbbab8
--- /dev/null
+++ b/tests/02615
@@ -0,0 +1,3 @@
+rm -f tests/root
+ln -s root1 tests/root
+LC_ALL=C TZ=GMT ./iostat -x --pretty --compact 1 2 > tests/out.iostat-compact.tmp && diff -u tests/expected.iostat-compact tests/out.iostat-compact.tmp

diff --git a/tests/TLIST b/tests/TLIST
index d392d3542535c24e974da0ab4b4ee93c5c54a662..dd6d5f998302497210312ebb25fda7661598a24f 100644 (file)
--- a/tests/TLIST
+++ b/tests/TLIST
@@ -358,6 +358,8 @@ NOTES:
 =====  Playing again with iostat
 02600  LC_ALL=C TZ=GMT ./iostat -ym 1 2 > tests/out.iostat-ym.tmp
 02610  LC_ALL=C TZ=GMT ./iostat --human > tests/out.iostat-human.tmp
+02613  LC_ALL=C TZ=GMT ./iostat -x --pretty > tests/out.iostat-x-pretty.tmp
+02615  LC_ALL=C TZ=GMT ./iostat -x --pretty --compact 1 2 > tests/out.iostat-compact.tmp
 02620  LC_ALL=C TZ=GMT ./iostat -dh -p ALL > tests/out.iostat-h.tmp
 02630  LC_ALL=C TZ=GMT ./iostat -kz -p ALL 1 2 > tests/out.iostat-kz.tmp
 02640  LC_ALL=C TZ=GMT ./iostat -dN -p ALL > tests/out.iostat-N.tmp

diff --git a/tests/expected.iostat-compact b/tests/expected.iostat-compact
new file mode 100644 (file)
index 0000000..a573d28
--- /dev/null
+++ b/tests/expected.iostat-compact
@@ -0,0 +1,24 @@
+Linux 1.2.3-TEST (SYSSTAT.TEST)        01/01/70        _x86_64_        (9 CPU)
+
+avg-cpu:  %user   %nice %system %iowait  %steal   %idle
+           1.49   39.91    1.67    0.94    0.00   56.00
+
+     r/s     rkB/s   rrqm/s  %rrqm r_await rareq-sz     w/s     wkB/s   wrqm/s  %wrqm w_await wareq-sz     d/s     dkB/s   drqm/s  %drqm d_await dareq-sz     f/s f_await  aqu-sz  %util Device
+    6.90    222.14     0.39   5.38   12.58    32.21    1.69     57.08     1.36  44.55    9.61    33.71    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.10   0.46 sda
+    0.01      0.29     0.00   0.00   60.92    41.33    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00 sdb
+    6.87    222.11     0.38   5.22   12.59    32.34    0.00      0.00     0.00   0.00    0.00     0.00    1.20     25.21     0.08   5.96   14.24    20.99    0.00    0.00    0.10   0.45 sdq
+    2.28     29.93     1.56  40.61    9.74    13.13    0.49     19.48     0.73  59.80   39.57    39.52    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.05   1.35 sdr
+    0.05      0.59     0.06  51.87    0.26    11.08    0.10      0.61     0.11  53.01    5.37     6.02    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.01 sds
+
+
+avg-cpu:  %user   %nice %system %iowait  %steal   %idle
+           2.15   12.50    2.35    0.12    0.00   82.89
+
+     r/s     rkB/s   rrqm/s  %rrqm r_await rareq-sz     w/s     wkB/s   wrqm/s  %wrqm w_await wareq-sz     d/s     dkB/s   drqm/s  %drqm d_await dareq-sz     f/s f_await  aqu-sz  %util Device
+    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00 sda
+    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.00   0.00 sdb
+    6.42      7.86     3.21  33.33    9.50     1.23    0.00      0.00     0.00   0.00    0.00     0.00    3.21     16.04     2.57  44.44   20.00     5.00    0.00    0.00    0.01   0.96 sdq
+    3.21      4.81     3.21  50.00    3.00     1.50    1.60     16.04     3.21  66.67   40.00    10.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.06   6.42 sdr
+    3.21     16.04     3.21  50.00    7.00     5.00    3.21      3.21     3.21  50.00   10.00     1.00    0.00      0.00     0.00   0.00    0.00     0.00    0.00    0.00    0.04   0.32 sds
+
+

diff --git a/tests/expected.iostat-x-pretty b/tests/expected.iostat-x-pretty
new file mode 100644 (file)
index 0000000..3341503
--- /dev/null
+++ b/tests/expected.iostat-x-pretty
@@ -0,0 +1,34 @@
+Linux 1.2.3-TEST (SYSSTAT.TEST)        01/01/70        _x86_64_        (9 CPU)
+
+avg-cpu:  %user   %nice %system %iowait  %steal   %idle
+           1.49   39.91    1.67    0.94    0.00   56.00
+
+     r/s     rkB/s   rrqm/s  %rrqm r_await rareq-sz Device
+    6.90    222.14     0.39   5.38   12.58    32.21 sda
+    0.01      0.29     0.00   0.00   60.92    41.33 sdb
+    6.87    222.11     0.38   5.22   12.59    32.34 sdq
+    2.28     29.93     1.56  40.61    9.74    13.13 sdr
+    0.05      0.59     0.06  51.87    0.26    11.08 sds
+
+     w/s     wkB/s   wrqm/s  %wrqm w_await wareq-sz Device
+    1.69     57.08     1.36  44.55    9.61    33.71 sda
+    0.00      0.00     0.00   0.00    0.00     0.00 sdb
+    0.00      0.00     0.00   0.00    0.00     0.00 sdq
+    0.49     19.48     0.73  59.80   39.57    39.52 sdr
+    0.10      0.61     0.11  53.01    5.37     6.02 sds
+
+     d/s     dkB/s   drqm/s  %drqm d_await dareq-sz Device
+    0.00      0.00     0.00   0.00    0.00     0.00 sda
+    0.00      0.00     0.00   0.00    0.00     0.00 sdb
+    1.20     25.21     0.08   5.96   14.24    20.99 sdq
+    0.00      0.00     0.00   0.00    0.00     0.00 sdr
+    0.00      0.00     0.00   0.00    0.00     0.00 sds
+
+     f/s f_await  aqu-sz  %util Device
+    0.00    0.00    0.10   0.46 sda
+    0.00    0.00    0.00   0.00 sdb
+    0.00    0.00    0.10   0.45 sdq
+    0.00    0.00    0.05   1.35 sdr
+    0.00    0.00    0.00   0.01 sds
+
+