Add new non regression tests

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

diff --git a/tests/01910 b/tests/01910
new file mode 100644 (file)
index 0000000..5f33ea1
--- /dev/null
+++ b/tests/01910
@@ -0,0 +1 @@
+LC_ALL=C TZ="America/New_York" ./sadf -d tests/data-tz.tmp -- -uw > tests/out.sadf-d-tz.tmp && diff -u tests/expected.sadf-d-tz tests/out.sadf-d-tz.tmp

diff --git a/tests/01915 b/tests/01915
new file mode 100644 (file)
index 0000000..8332a74
--- /dev/null
+++ b/tests/01915
@@ -0,0 +1 @@
+LC_ALL=C TZ="America/New_York" ./sadf -d tests/data-tz.tmp -T -- -uw > tests/out.sadf-d-T-tz.tmp && diff -u tests/expected.sadf-d-T-tz tests/out.sadf-d-T-tz.tmp

diff --git a/tests/01918 b/tests/01918
new file mode 100644 (file)
index 0000000..578647e
--- /dev/null
+++ b/tests/01918
@@ -0,0 +1 @@
+LC_ALL=C TZ="America/New_York" ./sadf -d tests/data-tz.tmp -t -- -uw > tests/out.sadf-d-t-tz.tmp && diff -u tests/expected.sadf-d-t-tz tests/out.sadf-d-t-tz.tmp

diff --git a/tests/01920 b/tests/01920
new file mode 100644 (file)
index 0000000..0450f93
--- /dev/null
+++ b/tests/01920
@@ -0,0 +1 @@
+LC_ALL=C TZ="America/New_York" ./sadf -r tests/data-tz.tmp -- -uw > tests/out.sadf-r-tz.tmp && diff -u tests/expected.sadf-r-tz tests/out.sadf-r-tz.tmp

diff --git a/tests/01925 b/tests/01925
new file mode 100644 (file)
index 0000000..733d59f
--- /dev/null
+++ b/tests/01925
@@ -0,0 +1 @@
+LC_ALL=C TZ="America/New_York" ./sadf -r tests/data-tz.tmp -T -- -uw > tests/out.sadf-r-T-tz.tmp && diff -u tests/expected.sadf-r-T-tz tests/out.sadf-r-T-tz.tmp

diff --git a/tests/01928 b/tests/01928
new file mode 100644 (file)
index 0000000..1e47de1
--- /dev/null
+++ b/tests/01928
@@ -0,0 +1 @@
+LC_ALL=C TZ="America/New_York" ./sadf -r tests/data-tz.tmp -t -- -uw > tests/out.sadf-r-t-tz.tmp && diff -u tests/expected.sadf-r-t-tz tests/out.sadf-r-t-tz.tmp

diff --git a/tests/TLIST b/tests/TLIST
index 4be1072f194a68008ee94c7bd33e3f760b7b198c..49c4ce1b16cbff883081a110b738738a45efa69e 100644 (file)
--- a/tests/TLIST
+++ b/tests/TLIST
@@ -333,6 +333,12 @@ NOTES:
 01900  LC_ALL=C TZ="America/New_York" ./sadf -g tests/data-tz.tmp -- -uw | grep ":20:" > tests/out.sadf-tz.tmp
 01905  LC_ALL=C TZ="America/New_York" ./sadf -g tests/data-tz.tmp -T -- -uw | grep ":20:" > tests/out.sadf-T-tz.tmp
 01908  LC_ALL=C TZ="America/New_York" ./sadf -g tests/data-tz.tmp -t -- -uw > tests/out.sadf-t-tz.tmp
+01910  LC_ALL=C TZ="America/New_York" ./sadf -d tests/data-tz.tmp -- -uw > tests/out.sadf-d-tz.tmp
+01915  LC_ALL=C TZ="America/New_York" ./sadf -d tests/data-tz.tmp -T -- -uw > tests/out.sadf-d-T-tz.tmp
+01918  LC_ALL=C TZ="America/New_York" ./sadf -d tests/data-tz.tmp -t -- -uw > tests/out.sadf-d-t-tz.tmp
+01920  LC_ALL=C TZ="America/New_York" ./sadf -r tests/data-tz.tmp -- -uw > tests/out.sadf-r-tz.tmp
+01925  LC_ALL=C TZ="America/New_York" ./sadf -r tests/data-tz.tmp -T -- -uw > tests/out.sadf-r-T-tz.tmp
+01928  LC_ALL=C TZ="America/New_York" ./sadf -r tests/data-tz.tmp -t -- -uw > tests/out.sadf-r-t-tz.tmp
 
 =====  iostat tests (basic output)
 02010  LC_ALL=C TZ=GMT ./iostat 2 3 > tests/out.iostat.tmp

diff --git a/tests/expected.sadf-d-T-tz b/tests/expected.sadf-d-T-tz
new file mode 100644 (file)
index 0000000..660346a
--- /dev/null
+++ b/tests/expected.sadf-d-T-tz
@@ -0,0 +1,6 @@
+# hostname;interval;timestamp;CPU;%user;%nice;%system;%iowait;%steal;%idle
+SYSSTAT.TEST;31;2019-04-18 09:20:19;-1;2.15;12.50;2.36;0.12;0.00;82.88
+SYSSTAT.TEST;31;2019-04-18 09:20:29;-1;2.28;0.00;1.93;0.48;0.00;95.31
+# hostname;interval;timestamp;proc/s;cswch/s
+SYSSTAT.TEST;31;2019-04-18 09:20:19;3.56;68409.30
+SYSSTAT.TEST;31;2019-04-18 09:20:29;4.83;46287.74

diff --git a/tests/expected.sadf-d-t-tz b/tests/expected.sadf-d-t-tz
new file mode 100644 (file)
index 0000000..0b9b2ad
--- /dev/null
+++ b/tests/expected.sadf-d-t-tz
@@ -0,0 +1,6 @@
+# hostname;interval;timestamp;CPU;%user;%nice;%system;%iowait;%steal;%idle
+SYSSTAT.TEST;31;2019-04-18 15:20:19 CET;-1;2.15;12.50;2.36;0.12;0.00;82.88
+SYSSTAT.TEST;31;2019-04-18 15:20:29 CET;-1;2.28;0.00;1.93;0.48;0.00;95.31
+# hostname;interval;timestamp;proc/s;cswch/s
+SYSSTAT.TEST;31;2019-04-18 15:20:19 CET;3.56;68409.30
+SYSSTAT.TEST;31;2019-04-18 15:20:29 CET;4.83;46287.74

diff --git a/tests/expected.sadf-d-tz b/tests/expected.sadf-d-tz
new file mode 100644 (file)
index 0000000..61aab4b
--- /dev/null
+++ b/tests/expected.sadf-d-tz
@@ -0,0 +1,6 @@
+# hostname;interval;timestamp;CPU;%user;%nice;%system;%iowait;%steal;%idle
+SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;-1;2.15;12.50;2.36;0.12;0.00;82.88
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;-1;2.28;0.00;1.93;0.48;0.00;95.31
+# hostname;interval;timestamp;proc/s;cswch/s
+SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;3.56;68409.30
+SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;4.83;46287.74

diff --git a/tests/expected.sadf-r-T-tz b/tests/expected.sadf-r-T-tz
new file mode 100644 (file)
index 0000000..b8290d6
--- /dev/null
+++ b/tests/expected.sadf-r-T-tz
@@ -0,0 +1,4 @@
+09:20:19; CPU; -1; %user; 96005; 96538; %nice; 2578701; 2581805; %system; 107589; 108174; %iowait; 60648; 60677; %steal; 0; 0; %idle; 3617879; 3638469;
+09:20:29; CPU; -1; %user; 96538; 97026; %nice; 2581805; 2584918; %system; 108174; 108649; %iowait; 60677; 60803; %steal; 0; 0; %idle; 3638469; 3659199;
+09:20:19; proc/s; 46972; 47083; cswch/s; 130465866; 132598184;
+09:20:29; proc/s; 47083; 47234; cswch/s; 132598184; 134044213;

diff --git a/tests/expected.sadf-r-t-tz b/tests/expected.sadf-r-t-tz
new file mode 100644 (file)
index 0000000..cf09d28
--- /dev/null
+++ b/tests/expected.sadf-r-t-tz
@@ -0,0 +1,4 @@
+15:20:19 CET; CPU; -1; %user; 96005; 96538; %nice; 2578701; 2581805; %system; 107589; 108174; %iowait; 60648; 60677; %steal; 0; 0; %idle; 3617879; 3638469;
+15:20:29 CET; CPU; -1; %user; 96538; 97026; %nice; 2581805; 2584918; %system; 108174; 108649; %iowait; 60677; 60803; %steal; 0; 0; %idle; 3638469; 3659199;
+15:20:19 CET; proc/s; 46972; 47083; cswch/s; 130465866; 132598184;
+15:20:29 CET; proc/s; 47083; 47234; cswch/s; 132598184; 134044213;

diff --git a/tests/expected.sadf-r-tz b/tests/expected.sadf-r-tz
new file mode 100644 (file)
index 0000000..ef5b311
--- /dev/null
+++ b/tests/expected.sadf-r-tz
@@ -0,0 +1,4 @@
+13:20:19 UTC; CPU; -1; %user; 96005; 96538; %nice; 2578701; 2581805; %system; 107589; 108174; %iowait; 60648; 60677; %steal; 0; 0; %idle; 3617879; 3638469;
+13:20:29 UTC; CPU; -1; %user; 96538; 97026; %nice; 2581805; 2584918; %system; 108174; 108649; %iowait; 60677; 60803; %steal; 0; 0; %idle; 3638469; 3659199;
+13:20:19 UTC; proc/s; 46972; 47083; cswch/s; 130465866; 132598184;
+13:20:29 UTC; proc/s; 47083; 47234; cswch/s; 132598184; 134044213;

diff --git a/tests/expected.sadf-t-tz b/tests/expected.sadf-t-tz
index e11ce8ae8669eecc1c71106ef9cec189ed721e54..56095c335d4f40094247f2b2fbc169868e283d23 100644 (file)
--- a/tests/expected.sadf-t-tz
+++ b/tests/expected.sadf-t-tz
@@ -46,7 +46,7 @@
 <text x="648" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,648,0)">15:20:27</text>
 <polyline points="20,0 20,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(36.000000,1)"/>
 <text x="720" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,720,0)">15:20:29</text>
-<text x="-10" y="30" style="fill: #ffff00; stroke: none; font-size: 12px; text-anchor: end">UTC</text>
+<text x="-10" y="30" style="fill: #ffff00; stroke: none; font-size: 12px; text-anchor: end">CET</text>
 <g style="fill: #00cc00; stroke: none" transform="scale(36.000000,-2.000000)">
 <rect x="0" y="0.00" height="2.15" width="31"/><rect x="0" y="0.00" height="2.28" width="31"/>
 </g>
@@ -100,7 +100,7 @@
 <text x="648" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,648,0)">15:20:27</text>
 <polyline points="20,0 20,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(36.000000,1)"/>
 <text x="720" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,720,0)">15:20:29</text>
-<text x="-10" y="30" style="fill: #ffff00; stroke: none; font-size: 12px; text-anchor: end">UTC</text>
+<text x="-10" y="30" style="fill: #ffff00; stroke: none; font-size: 12px; text-anchor: end">CET</text>
 <path d=" M10,3.56 L20,4.83" style="vector-effect: non-scaling-stroke; stroke: #00cc00; stroke-width: 1; fill-opacity: 0" transform="scale(36.000000,-41.377483)"/>
 </g>
 <rect x="0" y="310" height="300" width="1050" fill="#000000"/>
@@ -139,7 +139,7 @@
 <text x="648" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,648,0)">15:20:27</text>
 <polyline points="20,0 20,-200" style="vector-effect: non-scaling-stroke; stroke: #202020" transform="scale(36.000000,1)"/>
 <text x="720" y="10" style="fill: #ffffff; stroke: none; font-size: 12px; text-anchor: start" transform="rotate(45,720,0)">15:20:29</text>
-<text x="-10" y="30" style="fill: #ffff00; stroke: none; font-size: 12px; text-anchor: end">UTC</text>
+<text x="-10" y="30" style="fill: #ffff00; stroke: none; font-size: 12px; text-anchor: end">CET</text>
 <path d=" M10,68409.30 L20,46287.74" style="vector-effect: non-scaling-stroke; stroke: #ff00bf; stroke-width: 1; fill-opacity: 0" transform="scale(36.000000,-0.002924)"/>
 </g>
 </g>