From 42e9cd478c29b5208c1a04461aa53ead45ded3d6 Mon Sep 17 00:00:00 2001
From: Sebastien GODARD <sysstat@users.noreply.github.com>
Date: Sun, 23 Jan 2022 14:45:45 +0100
Subject: [PATCH] Update non regression tests

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
---
 tests/{00795 => 00791}         |   0
 tests/00793                    |   1 +
 tests/00794                    |   1 +
 tests/TLIST                    |   4 +++-
 tests/data-ukwn1               | Bin 0 -> 2872 bytes
 tests/expected.sadf-data-ukwn1 |  15 +++++++++++++++
 tests/expected3.sar-data-ukwn  |   6 ++++++
 7 files changed, 26 insertions(+), 1 deletion(-)
 rename tests/{00795 => 00791} (100%)
 create mode 100644 tests/00793
 create mode 100644 tests/00794
 create mode 100644 tests/data-ukwn1
 create mode 100644 tests/expected.sadf-data-ukwn1
 create mode 100644 tests/expected3.sar-data-ukwn

diff --git a/tests/00795 b/tests/00791
similarity index 100%
rename from tests/00795
rename to tests/00791
diff --git a/tests/00793 b/tests/00793
new file mode 100644
index 0000000..d02cb54
--- /dev/null
+++ b/tests/00793
@@ -0,0 +1 @@
+LC_ALL=C TZ=GMT ./sar -uq -f tests/data-ukwn1 > tests/out.sar-data-ukwn1.tmp && diff -u tests/expected3.sar-data-ukwn tests/out.sar-data-ukwn1.tmp
diff --git a/tests/00794 b/tests/00794
new file mode 100644
index 0000000..f0c83e2
--- /dev/null
+++ b/tests/00794
@@ -0,0 +1 @@
+LC_ALL=C ./sadf -H tests/data-ukwn1 > tests/out.sadf-data-ukwn1.tmp && diff -u tests/expected.sadf-data-ukwn1 tests/out.sadf-data-ukwn1.tmp
diff --git a/tests/TLIST b/tests/TLIST
index 32967fc..c86632f 100644
--- a/tests/TLIST
+++ b/tests/TLIST
@@ -166,7 +166,9 @@ NOTES:
 00784	LC_ALL=C TZ=GMT ./sar -w -f tests/data-ukwn > tests/out2.sar-data-ukwn.tmp
 00787	LC_ALL=C ./sadf -H tests/data-ukwn > tests/out.sadf-data-ukwn.tmp
 00790	LC_ALL=C TZ=GMT ./sar -A -f tests/data-ukwn0 > tests/out.sar-data-ukwn0.tmp
-00795	LC_ALL=C ./sadf -H tests/data-ukwn0 > tests/out.sadf-data-ukwn0.tmp
+00791	LC_ALL=C ./sadf -H tests/data-ukwn0 > tests/out.sadf-data-ukwn0.tmp
+00793	LC_ALL=C TZ=GMT ./sar -uq -f tests/data-ukwn1 > tests/out.sar-data-ukwn1.tmp
+00794	LC_ALL=C ./sadf -H tests/data-ukwn1 > tests/out.sadf-data-ukwn1.tmp
 
 =====	Testing sar's options
 00800	LC_ALL=C TZ=GMT ./sar --iface=lo,enp6s0,eth0 -n DEV,EDEV -f tests/data.tmp > tests/out.sar-iface.tmp
diff --git a/tests/data-ukwn1 b/tests/data-ukwn1
new file mode 100644
index 0000000000000000000000000000000000000000..514f6a4cc0099567e2779a7891f8c5fb2250dd31
GIT binary patch
literal 2872
zcmbPswN#OZm5m{QkpT=q6bSP`xFnJ7;cpW`8d9LTIDs@15LZF@APOc1VuS2a0b&Ud
z2MEL&ID9hmN-H2d^2nV0<iwne{NfTlFe@cLH!(Ah6r)V_3{CV5Ep!bH4D`~Hjg9px
zEX?A~Oo%svRP`7pJG+KJ#6aQG4aA@@1F=Ck0EoGO7zRLcy+90;2Z<X1F(}+YfCY$E
zCV*ra7+~=OVl(nd$%FKEdVzQh4B8NiL0%BT2>Z$nW^`#nC7{%OsKI&=BT*%RJXc<b
z5Gz#1460tY3ZkJHCIOX?h0<<N8l5VIID>&7Dlr{uZ!grmkL;*AVE)iW6^8SkLfyv(
z6)A<fFRKD#a2ZSjDsK;^{oy8{GOmLH5eW!G-S@5$!ng#B2&fuKD9wkY2buYm1HyxO
z>l9S~nmUMiQfT3)57n%MYzPwjJ(~KjQ1>ymLKu(G+$RIoD}ZDMGE*8FKA?030{qMn
zTA&tU-bR?iA;Ju^q4r5b`REis)O}E83_qcaR;c@Qq2|N%i9s2#^Z*mbMVA95T!B~}
zh&Q776{M#Fnm0P2Wfw>cm^Tza(b|n8ZxsK)o;Myq&DV!{24ol#z?C;9QaNvYq;lRk
zM`qr*fg^7OHbDZ2)V%QxN8aGChnPpLypc*~-jKnOH;QrOjXBVCLTcW4Nu|62sux{=
z7+2nS1I-(qsCh#X6s<it^2Vg!)Xf`Tshl@Lt093-t$M?#5@H^y^~Oycd1DKidE+~d
cyir8uym6AsdE+{j^M-F5Bt9suHwfho06`Cdj{pDw

literal 0
HcmV?d00001

diff --git a/tests/expected.sadf-data-ukwn1 b/tests/expected.sadf-data-ukwn1
new file mode 100644
index 0000000..e6d06a4
--- /dev/null
+++ b/tests/expected.sadf-data-ukwn1
@@ -0,0 +1,15 @@
+System activity data file: tests/data-ukwn1 (0x2175)
+File created by sar/sadc from sysstat version 12.5.6
+Genuine sa datafile: yes (0)
+Host: Linux 5.14.18-100.fc33.x86_64 (localhost.localdomain) 	01/23/22 	_x86_64_	(8 CPU)
+File date: 2022-01-23
+File time: 13:26:31 UTC (1642944391)
+Timezone: CET
+File composition: (1,1,12),(0,0,9),(2,0,1)
+Size of a long int: 8
+HZ = 100
+Number of activities in file: 2
+Extra structures available: N
+List of activities:
+01: [8b] A_CPU                Y:   9	(10,0,0)
+09: [8d] A_QUEUE              N:   1	(2,0,4) 	[Unknown format]
diff --git a/tests/expected3.sar-data-ukwn b/tests/expected3.sar-data-ukwn
new file mode 100644
index 0000000..c00be55
--- /dev/null
+++ b/tests/expected3.sar-data-ukwn
@@ -0,0 +1,6 @@
+Linux 5.14.18-100.fc33.x86_64 (localhost.localdomain) 	01/23/22 	_x86_64_	(8 CPU)
+
+13:26:31        CPU     %user     %nice   %system   %iowait    %steal     %idle
+13:26:32        all      0.37      0.00      0.12      0.00      0.00     99.50
+13:26:33        all      0.25      0.00      0.00      0.00      0.00     99.75
+Average:        all      0.31      0.00      0.06      0.00      0.00     99.63
-- 
2.40.0