Update non regression tests

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

diff --git a/tests/00067 b/tests/00067
new file mode 100644 (file)
index 0000000..6dcf9c3
--- /dev/null
+++ b/tests/00067
@@ -0,0 +1,20 @@
+# Create a datafile where CPU 8 is already offline when the file is created
+# before coming back online
+rm -f tests/data-CPUoffon.tmp
+
+rm -f tests/root
+ln -s root2 tests/root
+TZ=GMT ./sadc --unix_time=1555593619 -S XALL tests/data-CPUoffon.tmp 1 1 >/dev/null
+
+rm -f tests/root
+ln -s root3 tests/root
+TZ=GMT ./sadc --unix_time=1555593629 -S XALL tests/data-CPUoffon.tmp 1 1 >/dev/null
+
+rm -f tests/root
+ln -s root4 tests/root
+TZ=GMT ./sadc --unix_time=1555593639 -S XALL tests/data-CPUoffon.tmp 1 1 >/dev/null
+
+rm -f tests/root
+ln -s root5 tests/root
+TZ=GMT ./sadc --unix_time=1555593649 -S XALL tests/data-CPUoffon.tmp 1 1 >/dev/null
+

diff --git a/tests/00134 b/tests/00134
index 23f1e113c51536c5c581faf49dafc9a11d91e5c7..dd4f246d5dfffa5551adc804825d7f244356058d 100644 (file)
--- a/tests/00134
+++ b/tests/00134
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -I --int=0,3,30-50,4000-,LOC,PWD,MCE-XXX,TLB,sum -P all,3 -f tests/data.tmp > tests/out.sar-I.tmp && diff -u tests/expected.sar-I tests/out.sar-I.tmp
+LC_ALL=C TZ=GMT ./sar -I --int=0,3,30-50,4000-,LOC,PWD,MCE-XXX,TLB,sum -P all,3 --pretty -f tests/data.tmp > tests/out.sar-I.tmp && diff -u tests/expected.sar-I tests/out.sar-I.tmp

diff --git a/tests/00150 b/tests/00150
new file mode 100644 (file)
index 0000000..f7ec70d
--- /dev/null
+++ b/tests/00150
@@ -0,0 +1 @@
+LC_ALL=C TZ=GMT ./sar -u ALL -I -n SOFT -P all,8 -f tests/data-CPUoffon.tmp > tests/out.sar-CPUoffon.tmp && diff -u tests/expected.sar-CPUoffon tests/out.sar-CPUoffon.tmp

diff --git a/tests/TLIST b/tests/TLIST
index 1bc8ef0c815de6a66898185b660e3e3fe0188047..b40772ce85ab73ae0909c153a9541548a24d98b7 100644 (file)
--- a/tests/TLIST
+++ b/tests/TLIST
@@ -34,6 +34,9 @@ NOTES:
 -----  Create data1.tmp [..R.. / 67112] starting at root6
 00065  4 x TZ=GMT ./sadc --unix_time=xxxxxxx tests/data1.tmp 1 1 >/dev/null
 
+-----  Create data-CPUoffon.tmp [.... / 2345] starting at root2
+00067  4 x TZ=GMT ./sadc --unix_time=1555593619 -S XALL tests/data-CPUoffon.tmp 1 1 >/dev/null
+
 -----  Create data2.tmp [..R.. / 12267] starting at root1
 00068  4 x TZ=GMT ./sadc --unix_time=xxxxxxx tests/data2.tmp 1 1 >/dev/null
 
@@ -64,7 +67,10 @@ NOTES:
        [Don't take into account sensors statistics which are not read from test root directory]
 00132  LC_ALL=C TZ=GMT ./sar -A --int=30-35,RES -P 3 -f tests/data-new.tmp > tests/out3.sar-all.tmp
        [Check that -A doesn't necessarily imply -I ALL -P ALL]
-00134  LC_ALL=C TZ=GMT ./sar -I --int=0,3,30-50,4000-,LOC,PWD,MCE-XXX,TLB,sum -P all,3 -f tests/data.tmp > tests/out.sar-I.tmp
+00134  LC_ALL=C TZ=GMT ./sar -I --int=0,3,30-50,4000-,LOC,PWD,MCE-XXX,TLB,sum -P all,3 --pretty -f tests/data.tmp > tests/out.sar-I.tmp
+
+=====  sar: Reading data-CPUoffon.tmp
+00150  LC_ALL=C TZ=GMT ./sar -u ALL -I -n SOFT -P all,8 -f tests/data-CPUoffon.tmp > tests/out.sar-CPUoffon.tmp
 
 =====  sar: Reading data.tmp
 00160  LC_ALL=C TZ=GMT ./sar -C -u -P ALL -f tests/data.tmp > tests/out2.sar-u.tmp

diff --git a/tests/expected.sar-CPUoffon b/tests/expected.sar-CPUoffon
new file mode 100644 (file)
index 0000000..83ef950
--- /dev/null
+++ b/tests/expected.sar-CPUoffon
@@ -0,0 +1,199 @@
+Linux 1.2.3-TEST (SYSSTAT.TEST)        04/18/19        _x86_64_        (9 CPU)
+
+13:20:19        CPU      %usr     %nice      %sys   %iowait    %steal      %irq     %soft    %guest    %gnice     %idle
+13:20:29        all      2.28      0.00      1.55      0.48      0.00      0.19      0.19      0.00      0.00     95.31
+13:20:39        all      2.66     23.20      1.74      0.17      0.00      0.33      0.20      0.00      0.00     71.70
+13:20:49        all      6.21      8.70      6.64      0.49      0.39      0.54      0.34      0.59      0.10     75.90
+13:20:49          8      2.84      0.00     39.98      0.00      4.50      0.00      0.00      6.75      1.13     44.80
+Average:        all      4.01     13.45      2.36      0.39      0.00      0.40      0.27      0.00      0.00     79.13
+
+13:20:19         INTR       all
+13:20:29          sum      0.00
+13:20:29            0      0.00
+13:20:29            8      0.00
+13:20:29            9      0.00
+13:20:29           16      0.00
+13:20:29           17      0.00
+13:20:29           18      0.00
+13:20:29           19     23.34
+13:20:29           23     23.88
+13:20:29           24     12.93
+13:20:29           25      0.00
+13:20:29           26      0.00
+13:20:29           27      0.00
+13:20:29           28      0.00
+13:20:29           29      0.00
+13:20:29           30      0.00
+13:20:29           31      0.00
+13:20:29           32      0.00
+13:20:29           33     10.21
+13:20:29           34      0.00
+13:20:29           35      0.00
+13:20:29           36      0.00
+13:20:29          NMI      0.00
+13:20:29          LOC      0.00
+13:20:29          SPU      0.00
+13:20:29          PMI      0.00
+13:20:29          IWI      0.00
+13:20:29          RTR      0.00
+13:20:29          RES      0.00
+13:20:29          CAL      0.00
+13:20:29          TLB      0.00
+13:20:29          TRM      0.00
+13:20:29          THR      0.00
+13:20:29          DFR      0.00
+13:20:29          MCE      0.00
+13:20:29          MCP      0.00
+13:20:29          HYP      0.00
+13:20:29          HRE      0.00
+13:20:29          HVS      0.00
+13:20:29          ERR      0.00
+13:20:29          MIS      0.00
+13:20:29          PIN      0.00
+13:20:29          NPI      0.00
+13:20:29          PIW      0.00
+
+13:20:29         INTR       all
+13:20:39          sum  33726.88
+13:20:39            0      0.00
+13:20:39            8      0.00
+13:20:39            9      0.00
+13:20:39           16      0.00
+13:20:39           17      0.00
+13:20:39           18      0.00
+13:20:39           19     22.73
+13:20:39           23     31.12
+13:20:39           24      8.78
+13:20:39           25      0.00
+13:20:39           26      0.00
+13:20:39           27      1.30
+13:20:39           28      0.00
+13:20:39           29      0.00
+13:20:39           30      0.00
+13:20:39           31      0.00
+13:20:39           32      0.00
+13:20:39           33     61.87
+13:20:39           34      0.00
+13:20:39           35      0.00
+13:20:39           36      0.00
+13:20:39          NMI      5.87
+13:20:39          LOC  29624.05
+13:20:39          SPU      0.00
+13:20:39          PMI      5.87
+13:20:39          IWI      0.00
+13:20:39          RTR      0.00
+13:20:39          RES   1628.68
+13:20:39          CAL    866.05
+13:20:39          TLB   1469.58
+13:20:39          TRM      0.00
+13:20:39          THR      0.00
+13:20:39          DFR      0.00
+13:20:39          MCE      0.00
+13:20:39          MCP      0.99
+13:20:39          HYP      0.00
+13:20:39          HRE      0.00
+13:20:39          HVS      0.00
+13:20:39          ERR      0.00
+13:20:39          MIS      0.00
+13:20:39          PIN      0.00
+13:20:39          NPI      0.00
+13:20:39          PIW      0.00
+
+13:20:39         INTR       all      CPU8
+13:20:49          sum 727313.35     52.30
+13:20:49            0      0.00      0.00
+13:20:49            8      0.00      0.00
+13:20:49            9      0.00      0.00
+13:20:49           16      0.00      0.00
+13:20:49           17      0.00      0.00
+13:20:49           18      0.00      0.00
+13:20:49           19     26.75      0.00
+13:20:49           23     17.55      0.00
+13:20:49           24     15.14      0.00
+13:20:49           25      0.00      0.00
+13:20:49           26      0.00      0.00
+13:20:49           27      0.13      0.13
+13:20:49           28      0.00      0.00
+13:20:49           29      0.00      0.00
+13:20:49           30      0.00      0.00
+13:20:49           31      0.00      0.00
+13:20:49           32      0.00      0.00
+13:20:49           33     21.93      0.00
+13:20:49           34  34629.52      0.00
+13:20:49           35      0.00      0.00
+13:20:49           36      0.00      0.00
+13:20:49          NMI      4.91      0.22
+13:20:49          LOC 682157.17      0.45
+13:20:49          SPU      0.00      0.00
+13:20:49          PMI      4.91      0.22
+13:20:49          IWI      0.00      0.00
+13:20:49          RTR      0.00      0.00
+13:20:49          RES   4564.85      0.36
+13:20:49          CAL   2123.05      4.47
+13:20:49          TLB   3744.57     44.66
+13:20:49          TRM      0.00      0.00
+13:20:49          THR      0.00      0.00
+13:20:49          DFR      0.00      0.00
+13:20:49          MCE      0.00      0.00
+13:20:49          MCP      2.86      1.79
+13:20:49          HYP      0.00      0.00
+13:20:49          HRE      0.00      0.00
+13:20:49          HVS      0.00      0.00
+13:20:49          ERR      0.00      0.00
+13:20:49          MIS      0.00      0.00
+13:20:49          PIN      0.00      0.00
+13:20:49          NPI      0.00      0.00
+13:20:49          PIW      0.00      0.00
+
+Average:         INTR       all
+Average:          sum  37732.43
+Average:            0      0.00
+Average:            8      0.00
+Average:            9      0.00
+Average:           16      0.00
+Average:           17      0.00
+Average:           18      0.00
+Average:           19     23.91
+Average:           23     25.37
+Average:           24     11.73
+Average:           25      0.00
+Average:           26      0.00
+Average:           27      0.58
+Average:           28      0.00
+Average:           29      0.00
+Average:           30      0.00
+Average:           31      0.00
+Average:           32      0.00
+Average:           33     34.65
+Average:           34    157.82
+Average:           35      0.00
+Average:           36      0.00
+Average:          NMI      2.61
+Average:          LOC  35417.15
+Average:          SPU      0.00
+Average:          PMI      2.61
+Average:          IWI      0.00
+Average:          RTR      0.00
+Average:          RES    840.16
+Average:          CAL    430.39
+Average:          TLB    784.62
+Average:          TRM      0.00
+Average:          THR      0.00
+Average:          DFR      0.00
+Average:          MCE      0.00
+Average:          MCP      0.85
+Average:          HYP      0.00
+Average:          HRE      0.00
+Average:          HVS      0.00
+Average:          ERR      0.00
+Average:          MIS      0.00
+Average:          PIN      0.00
+Average:          NPI      0.00
+Average:          PIW      0.00
+
+13:20:19        CPU   total/s   dropd/s squeezd/s  rx_rps/s flw_lim/s
+13:20:29        all      0.00      0.00      0.00      0.00      0.00
+13:20:39        all      0.00      0.00      0.00      0.00      0.00
+13:20:49        all      4.29      0.00      0.00      0.00      0.00
+13:20:49          8      4.29      0.00      0.00      0.00      0.00
+Average:        all      0.00      0.00      0.00      0.00      0.00

diff --git a/tests/expected.sar-I b/tests/expected.sar-I
index 9ec8f69dd95606a5ae9f0277df8b112e55890854..b88770e8c6b8cfc30e5faedbf066ad20b6c08f16 100644 (file)
--- a/tests/expected.sar-I
+++ b/tests/expected.sar-I
@@ -1,96 +1,96 @@
 Linux 1.2.3-TEST (SYSSTAT.TEST)        04/18/19        _x86_64_        (9 CPU)
 
-13:20:09         INTR       all      CPU3
-13:20:19          sum  31915.30   1027.05
-13:20:19            0      0.00      0.00
-13:20:19           30      0.00      0.00
-13:20:19           31      0.00      0.00
-13:20:19           32      0.00      0.00
-13:20:19           33     15.11     15.11
-13:20:19           34    149.98      0.00
-13:20:19           35      0.00      0.00
-13:20:19           36      0.00      0.00
-13:20:19          LOC  34485.34   1009.79
-13:20:19          TLB      0.00      0.35
+13:20:09          all      CPU3 INTR
+13:20:19     31915.30   1027.05 sum
+13:20:19         0.00      0.00 0
+13:20:19         0.00      0.00 30
+13:20:19         0.00      0.00 31
+13:20:19         0.00      0.00 32
+13:20:19        15.11     15.11 33
+13:20:19       149.98      0.00 34
+13:20:19         0.00      0.00 35
+13:20:19         0.00      0.00 36
+13:20:19     34485.34   1009.79 LOC
+13:20:19         0.00      0.35 TLB
 
-13:20:19         INTR       all      CPU3
-13:20:29          sum      0.00   1021.51
-13:20:29            0      0.00      0.00
-13:20:29           30      0.00      0.00
-13:20:29           31      0.00      0.00
-13:20:29           32      0.00      0.00
-13:20:29           33     10.21     10.21
-13:20:29           34      0.00      0.00
-13:20:29           35      0.00      0.00
-13:20:29           36      0.00      0.00
-13:20:29          LOC      0.00   1010.24
-13:20:29          TLB      0.00      0.32
+13:20:19          all      CPU3 INTR
+13:20:29         0.00   1021.51 sum
+13:20:29         0.00      0.00 0
+13:20:29         0.00      0.00 30
+13:20:29         0.00      0.00 31
+13:20:29         0.00      0.00 32
+13:20:29        10.21     10.21 33
+13:20:29         0.00      0.00 34
+13:20:29         0.00      0.00 35
+13:20:29         0.00      0.00 36
+13:20:29         0.00   1010.24 LOC
+13:20:29         0.00      0.32 TLB
 
-13:20:29         INTR       all      CPU3
-13:20:39          sum  33726.88   3135.71
-13:20:39            0      0.00      0.00
-13:20:39           30      0.00      0.00
-13:20:39           31      0.00      0.00
-13:20:39           32      0.00      0.00
-13:20:39           33     61.87     61.87
-13:20:39           34      0.00      0.00
-13:20:39           35      0.00      0.00
-13:20:39           36      0.00      0.00
-13:20:39          LOC  29624.05   2896.70
-13:20:39          TLB   1469.58    114.47
+13:20:29          all      CPU3 INTR
+13:20:39     33726.88   3135.71 sum
+13:20:39         0.00      0.00 0
+13:20:39         0.00      0.00 30
+13:20:39         0.00      0.00 31
+13:20:39         0.00      0.00 32
+13:20:39        61.87     61.87 33
+13:20:39         0.00      0.00 34
+13:20:39         0.00      0.00 35
+13:20:39         0.00      0.00 36
+13:20:39     29624.05   2896.70 LOC
+13:20:39      1469.58    114.47 TLB
 
-13:20:39         INTR       all      CPU3
-13:20:49          sum 727313.35  10946.76
-13:20:49            0      0.00      0.00
-13:20:49           30      0.00      0.00
-13:20:49           31      0.00      0.00
-13:20:49           32      0.00      0.00
-13:20:49           33     21.93     21.93
-13:20:49           34  34629.52      0.00
-13:20:49           35      0.00      0.00
-13:20:49           36      0.00      0.00
-13:20:49          LOC 682157.17  10853.19
-13:20:49          TLB   3744.57     33.45
+13:20:39          all      CPU3 INTR
+13:20:49    727313.35  10946.76 sum
+13:20:49         0.00      0.00 0
+13:20:49         0.00      0.00 30
+13:20:49         0.00      0.00 31
+13:20:49         0.00      0.00 32
+13:20:49        21.93     21.93 33
+13:20:49     34629.52      0.00 34
+13:20:49         0.00      0.00 35
+13:20:49         0.00      0.00 36
+13:20:49    682157.17  10853.19 LOC
+13:20:49      3744.57     33.45 TLB
 
-Average:         INTR       all      CPU3
-Average:          sum  36261.87   3485.39
-Average:            0      0.00      0.00
-Average:           30      0.00      0.00
-Average:           31      0.00      0.00
-Average:           32      0.00      0.00
-Average:           33     29.71     29.71
-Average:           34    155.84      0.00
-Average:           35      0.00      0.00
-Average:           36      0.00      0.00
-Average:          LOC  35181.59   3386.55
-Average:          TLB    407.35     41.99
+Average:          all      CPU3 INTR
+Average:     36261.87   3485.39 sum
+Average:         0.00      0.00 0
+Average:         0.00      0.00 30
+Average:         0.00      0.00 31
+Average:         0.00      0.00 32
+Average:        29.71     29.71 33
+Average:       155.84      0.00 34
+Average:         0.00      0.00 35
+Average:         0.00      0.00 36
+Average:     35181.59   3386.55 LOC
+Average:       407.35     41.99 TLB
 
 13:37:29     LINUX RESTART     (9 CPU)
 
 13:54:09     LINUX RESTART     (10 CPU)
 
-13:54:15         INTR       all      CPU3
-13:54:35          sum  35926.40   1027.05
-13:54:35            0      0.00      0.00
-13:54:35           30      0.00      0.00
-13:54:35           31      0.00      0.00
-13:54:35           32      0.00      0.00
-13:54:35           33     15.11     15.11
-13:54:35           34    149.98      0.00
-13:54:35           35      0.00      0.00
-13:54:35           36      0.00      0.00
-13:54:35          LOC  34881.39   1009.79
-13:54:35          TLB    401.22      0.35
+13:54:15          all      CPU3 INTR
+13:54:35     35926.40   1027.05 sum
+13:54:35         0.00      0.00 0
+13:54:35         0.00      0.00 30
+13:54:35         0.00      0.00 31
+13:54:35         0.00      0.00 32
+13:54:35        15.11     15.11 33
+13:54:35       149.98      0.00 34
+13:54:35         0.00      0.00 35
+13:54:35         0.00      0.00 36
+13:54:35     34881.39   1009.79 LOC
+13:54:35       401.22      0.35 TLB
 
-Average:         INTR       all      CPU3
-Average:          sum  35926.40   1027.05
-Average:            0      0.00      0.00
-Average:           30      0.00      0.00
-Average:           31      0.00      0.00
-Average:           32      0.00      0.00
-Average:           33     15.11     15.11
-Average:           34    149.98      0.00
-Average:           35      0.00      0.00
-Average:           36      0.00      0.00
-Average:          LOC  34881.39   1009.79
-Average:          TLB    401.22      0.35
+Average:          all      CPU3 INTR
+Average:     35926.40   1027.05 sum
+Average:         0.00      0.00 0
+Average:         0.00      0.00 30
+Average:         0.00      0.00 31
+Average:         0.00      0.00 32
+Average:        15.11     15.11 33
+Average:       149.98      0.00 34
+Average:         0.00      0.00 35
+Average:         0.00      0.00 36
+Average:     34881.39   1009.79 LOC
+Average:       401.22      0.35 TLB