From: Sebastien GODARD Date: Mon, 27 Jul 2020 09:52:21 +0000 (+0200) Subject: Update non regression environment X-Git-Tag: v12.4.0~10 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f05d6773a5647c4434bd0e263b6457c6cb598611;p=sysstat Update non regression environment Signed-off-by: Sebastien GODARD --- diff --git a/tests/expected.data-ini b/tests/expected.data-ini index ee424be..afcf4f9 100644 --- a/tests/expected.data-ini +++ b/tests/expected.data-ini @@ -2517,8 +2517,8 @@ Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.0 13:20:19 0.00 0.00 0.00 0.00 0.00 13:20:29 5.44 2.24 3.20 0.00 3.20 13:20:39 0.00 0.91 0.00 299.22 0.00 -13:20:49 0.00 0.00 0.00 0.00 0.00 -Average: 0.00 0.00 0.00 0.00 0.00 +13:20:49 0.94 0.89 0.04 44.66 0.45 +Average: 1.05 1.01 0.03 79.61 0.28 13:20:09 kbmemfree kbavail kbmemused %memused kbbuffers kbcached kbcommit %commit kbactive kbinact kbdirty kbanonpg kbslab kbkstack kbpgtbl kbvmused 13:20:19 1437740 4389516 3179712 39.04 260172 2821596 12097852 48.54 4042384 1772396 396 2733164 445740 15328 73760 0 diff --git a/tests/expected.iostat-sigint b/tests/expected.iostat-sigint index cd4efad..812e56c 100644 --- a/tests/expected.iostat-sigint +++ b/tests/expected.iostat-sigint @@ -41,6 +41,8 @@ avg-cpu: %user %nice %system %iowait %steal %idle Device tps kB_read/s kB_wrtn/s kB_dscd/s kB_read kB_wrtn kB_dscd sda 0.00 0.00 0.00 0.00 0 0 0 sdd 0.00 0.00 0.00 0.00 0 0 0 +sdf 0.00 0.00 0.00 0.00 0 0 0 +sdg 0.94 22.33 0.22 0.00 500 5 0 avg-cpu: %user %nice %system %iowait %steal %idle diff --git a/tests/expected.iostat-x-ALL-flush b/tests/expected.iostat-x-ALL-flush index d0c048b..c2247a7 100644 --- a/tests/expected.iostat-x-ALL-flush +++ b/tests/expected.iostat-x-ALL-flush @@ -28,5 +28,7 @@ avg-cpu: %user %nice %system %iowait %steal %idle Device 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 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 sdd 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 1.52 59.32 0.00 0.00 +sdf 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 +sdg 0.89 22.33 0.22 20.00 5.00 25.00 0.04 0.22 0.00 0.00 30.00 5.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.04 0.09 diff --git a/tests/expected.sadf-d b/tests/expected.sadf-d index e8973b4..a599192 100644 --- a/tests/expected.sadf-d +++ b/tests/expected.sadf-d @@ -2009,7 +2009,7 @@ SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;0.00;0.00;0.00;0.00;0.00;0.00;0.00;0.00; SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;0.00;0.00;0.00;0.00;0.00;0.00;0.00 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;5.44;2.24;3.20;0.00;0.00;3.20;0.00 SYSSTAT.TEST;39;2019-04-18 13:20:39 UTC;0.00;0.91;0.00;0.00;299.22;0.00;0.00 -SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;0.00;0.00;0.00;0.00;0.00;0.00;0.00 +SYSSTAT.TEST;22;2019-04-18 13:20:49 UTC;0.94;0.89;0.04;0.00;44.66;0.45;0.00 # hostname;interval;timestamp;kbmemfree;kbavail;kbmemused;%memused;kbbuffers;kbcached;kbcommit;%commit;kbactive;kbinact;kbdirty;kbanonpg;kbslab;kbkstack;kbpgtbl;kbvmused SYSSTAT.TEST;31;2019-04-18 13:20:19 UTC;1437740;4389516;3179712;39.04;260172;2821596;12097852;48.54;4042384;1772396;396;2733164;445740;15328;73760;0 SYSSTAT.TEST;31;2019-04-18 13:20:29 UTC;1437740;4389516;3179712;39.04;260172;2821596;12097852;48.54;4042384;1772396;396;2733164;445740;15328;73760;0 diff --git a/tests/expected.sadf-g b/tests/expected.sadf-g index ce558ae..5369b18 100644 --- a/tests/expected.sadf-g +++ b/tests/expected.sadf-g @@ -1039,9 +1039,9 @@ 13:54:29 UTC - - - + + + @@ -1083,8 +1083,8 @@ 13:54:29 UTC - - + + diff --git a/tests/expected.sadf-j b/tests/expected.sadf-j index 9838564..106638b 100644 --- a/tests/expected.sadf-j +++ b/tests/expected.sadf-j @@ -2330,7 +2330,7 @@ ], "swap-pages": {"pswpin": 0.00, "pswpout": 0.00}, "paging": {"pgpgin": 0.00, "pgpgout": 0.00, "fault": 0.00, "majflt": 0.00, "pgfree": 0.00, "pgscank": 0.00, "pgscand": 0.00, "pgsteal": 0.00, "vmeff-percent": 0.00}, - "io": {"tps": 0.00, "io-reads": {"rtps": 0.00, "bread": 0.00}, "io-writes": {"wtps": 0.00, "bwrtn": 0.00}, "io-discard": {"dtps": 0.00, "bdscd": 0.00}}, + "io": {"tps": 0.94, "io-reads": {"rtps": 0.89, "bread": 44.66}, "io-writes": {"wtps": 0.04, "bwrtn": 0.45}, "io-discard": {"dtps": 0.00, "bdscd": 0.00}}, "memory": {"memfree": 1437740, "avail": 4389516, "memused": 3179712, "memused-percent": 39.04, "buffers": 260172, "cached": 2821596, "commit": 12097852, "commit-percent": 48.54, "active": 4042384, "inactive": 1772396, "dirty": 396, "anonpg": 2733164, "slab": 445740, "kstack": 15328, "pgtbl": 73760, "vmused": 0, "swpfree": 16777212, "swpused": 0, "swpused-percent": 0.00, "swpcad": 0, "swpcad-percent": 0.00}, "hugepages": {"hugfree": 0, "hugused": 0, "hugused-percent": 0.00, "hugrsvd": 0, "hugsurp": 0}, "kernel": {"dentunusd": 156063, "file-nr": 16704, "inode-nr": 157735, "pty-nr": 4}, diff --git a/tests/expected.sadf-p b/tests/expected.sadf-p index acd49e8..9c5134e 100644 --- a/tests/expected.sadf-p +++ b/tests/expected.sadf-p @@ -2367,12 +2367,12 @@ SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC - dtps 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC - bread/s 299.22 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC - bwrtn/s 0.00 SYSSTAT.TEST 39 2019-04-18 13:20:39 UTC - bdscd/s 0.00 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC - tps 0.00 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC - rtps 0.00 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC - wtps 0.00 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC - tps 0.94 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC - rtps 0.89 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC - wtps 0.04 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC - dtps 0.00 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC - bread/s 0.00 -SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC - bwrtn/s 0.00 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC - bread/s 44.66 +SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC - bwrtn/s 0.45 SYSSTAT.TEST 22 2019-04-18 13:20:49 UTC - bdscd/s 0.00 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC - kbmemfree 1437740 SYSSTAT.TEST 31 2019-04-18 13:20:19 UTC - kbavail 4389516 diff --git a/tests/expected.sadf-r b/tests/expected.sadf-r index ac4f0c6..e00d458 100644 --- a/tests/expected.sadf-r +++ b/tests/expected.sadf-r @@ -2059,7 +2059,7 @@ 13:20:39 UTC; tps [DEC]; 62002; 61940; rtps; 49722; 49757; wtps [DEC]; 12280; 12183; dtps; 0; 0; bread/s; 3197010; 3208530; bwrtn/s [DEC]; 821188; 821112; bdscd/s; 0; 0; # uptime_cs; 731585; ust_time; 1555593649; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:49 # name; A_IO; nr_curr; 1; nr_alloc; 1; nr_ini; 1 -13:20:49 UTC; tps [DEC]; 61940; 61781; rtps [DEC]; 49757; 49601; wtps [DEC]; 12183; 12180; dtps; 0; 0; bread/s [DEC]; 3208530; 3195498; bwrtn/s [DEC]; 821112; 821088; bdscd/s; 0; 0; +13:20:49 UTC; tps; 61940; 61961; rtps; 49757; 49777; wtps; 12183; 12184; dtps; 0; 0; bread/s; 3208530; 3209530; bwrtn/s; 821112; 821122; bdscd/s; 0; 0; # uptime_cs; 0; ust_time; 1555594649; extra_next; 0; record_type; 2; HH:MM:SS; 13:37:29 # uptime_cs; 722372; ust_time; 1555593619; extra_next; 0; record_type; 1; HH:MM:SS; 13:20:19 # name; A_MEMORY; nr_curr; 1; nr_alloc; 1; nr_ini; 1 diff --git a/tests/expected.sadf-x b/tests/expected.sadf-x index b2c7fb7..0e9fa67 100644 --- a/tests/expected.sadf-x +++ b/tests/expected.sadf-x @@ -2415,9 +2415,9 @@ xsi:schemaLocation="http://pagesperso-orange.fr/sebastien.godard sysstat.xsd"> - 0.00 - - + 0.94 + + diff --git a/tests/expected.sar-all b/tests/expected.sar-all index 36e6cf8..5469851 100644 --- a/tests/expected.sar-all +++ b/tests/expected.sar-all @@ -2517,8 +2517,8 @@ Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.0 13:20:19 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:29 5.44 2.24 3.20 0.00 0.00 3.20 0.00 13:20:39 0.00 0.91 0.00 0.00 299.22 0.00 0.00 -13:20:49 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:49 0.94 0.89 0.04 0.00 44.66 0.45 0.00 +Average: 1.05 1.01 0.03 0.00 79.61 0.28 0.00 13:20:09 kbmemfree kbavail kbmemused %memused kbbuffers kbcached kbcommit %commit kbactive kbinact kbdirty kbanonpg kbslab kbkstack kbpgtbl kbvmused 13:20:19 1437740 4389516 3179712 39.04 260172 2821596 12097852 48.54 4042384 1772396 396 2733164 445740 15328 73760 0 diff --git a/tests/expected.sar-dec b/tests/expected.sar-dec index 5c7a8ac..5691e1f 100644 --- a/tests/expected.sar-dec +++ b/tests/expected.sar-dec @@ -2517,8 +2517,8 @@ Average: 0 0 0 0 0 0 13:20:19 0 0 0 0 0 0 0 13:20:29 5 2 3 0 0 3 0 13:20:39 0 1 0 0 299 0 0 -13:20:49 0 0 0 0 0 0 0 -Average: 0 0 0 0 0 0 0 +13:20:49 1 1 0 0 45 0 0 +Average: 1 1 0 0 80 0 0 13:20:09 kbmemfree kbavail kbmemused %memused kbbuffers kbcached kbcommit %commit kbactive kbinact kbdirty kbanonpg kbslab kbkstack kbpgtbl kbvmused 13:20:19 1437740 4389516 3179712 39 260172 2821596 12097852 49 4042384 1772396 396 2733164 445740 15328 73760 0 diff --git a/tests/expected.sar-human b/tests/expected.sar-human index 2121abe..971f01e 100644 --- a/tests/expected.sar-human +++ b/tests/expected.sar-human @@ -2517,8 +2517,8 @@ Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.0 13:20:19 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:29 5.44 2.24 3.20 0.00 0.00 3.20 0.00 13:20:39 0.00 0.91 0.00 0.00 299.22 0.00 0.00 -13:20:49 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:49 0.94 0.89 0.04 0.00 44.66 0.45 0.00 +Average: 1.05 1.01 0.03 0.00 79.61 0.28 0.00 13:20:09 kbmemfree kbavail kbmemused %memused kbbuffers kbcached kbcommit %commit kbactive kbinact kbdirty kbanonpg kbslab kbkstack kbpgtbl kbvmused 13:20:19 1.4G 4.2G 3.0G 39.0% 254.1M 2.7G 11.5G 48.5% 3.9G 1.7G 396.0k 2.6G 435.3M 15.0M 72.0M 0.0k diff --git a/tests/expected2.sadf-g b/tests/expected2.sadf-g index ca9b856..cef74a5 100644 --- a/tests/expected2.sadf-g +++ b/tests/expected2.sadf-g @@ -1065,9 +1065,9 @@ 22:00 0:00 - - - + + + @@ -1115,8 +1115,8 @@ 22:00 0:00 - - + + diff --git a/tests/expected2.sar-all b/tests/expected2.sar-all index d91b01c..d0e4542 100644 --- a/tests/expected2.sar-all +++ b/tests/expected2.sar-all @@ -2517,8 +2517,8 @@ Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.0 13:20:19 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:29 5.44 2.24 3.20 0.00 0.00 3.20 0.00 13:20:39 0.00 0.91 0.00 0.00 299.22 0.00 0.00 -13:20:49 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:49 0.94 0.89 0.04 0.00 44.66 0.45 0.00 +Average: 1.05 1.01 0.03 0.00 79.61 0.28 0.00 13:20:09 kbmemfree kbavail kbmemused %memused kbbuffers kbcached kbcommit %commit kbactive kbinact kbdirty kbanonpg kbslab kbkstack kbpgtbl kbvmused 13:20:19 1437740 4389516 3179712 39.04 260172 2821596 12097852 48.54 4042384 1772396 396 2733164 445740 15328 73760 0 diff --git a/tests/expected3.sar-all b/tests/expected3.sar-all index 0477c3a..8a4f0fb 100644 --- a/tests/expected3.sar-all +++ b/tests/expected3.sar-all @@ -54,8 +54,8 @@ Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.0 13:20:19 0.00 0.00 0.00 0.00 0.00 0.00 0.00 13:20:29 5.44 2.24 3.20 0.00 0.00 3.20 0.00 13:20:39 0.00 0.91 0.00 0.00 299.22 0.00 0.00 -13:20:49 0.00 0.00 0.00 0.00 0.00 0.00 0.00 -Average: 0.00 0.00 0.00 0.00 0.00 0.00 0.00 +13:20:49 0.94 0.89 0.04 0.00 44.66 0.45 0.00 +Average: 1.05 1.01 0.03 0.00 79.61 0.28 0.00 13:20:09 kbmemfree kbavail kbmemused %memused kbbuffers kbcached kbcommit %commit kbactive kbinact kbdirty kbanonpg kbslab kbkstack kbpgtbl kbvmused 13:20:19 1437740 4389516 3179712 39.04 260172 2821596 12097852 48.54 4042384 1772396 396 2733164 445740 15328 73760 0 diff --git a/tests/root5/sys/block/sdf/_list b/tests/root5/sys/block/sdf/_list new file mode 100644 index 0000000..1ccc5e2 --- /dev/null +++ b/tests/root5/sys/block/sdf/_list @@ -0,0 +1,3 @@ +. +.. +device diff --git a/tests/root5/sys/block/sdf/device/_void b/tests/root5/sys/block/sdf/device/_void new file mode 100644 index 0000000..e69de29 diff --git a/tests/root5/sys/block/sdf/stat b/tests/root5/sys/block/sdf/stat new file mode 100644 index 0000000..bdd6380 --- /dev/null +++ b/tests/root5/sys/block/sdf/stat @@ -0,0 +1 @@ +47 0 4184 2938 0 0 0 0 0 33 2917 0 0 0 0 diff --git a/tests/root5/sys/block/sdg/_list b/tests/root5/sys/block/sdg/_list new file mode 100644 index 0000000..1ccc5e2 --- /dev/null +++ b/tests/root5/sys/block/sdg/_list @@ -0,0 +1,3 @@ +. +.. +device diff --git a/tests/root5/sys/block/sdg/device/_void b/tests/root5/sys/block/sdg/device/_void new file mode 100644 index 0000000..e69de29 diff --git a/tests/root5/sys/block/sdg/stat b/tests/root5/sys/block/sdg/stat new file mode 100644 index 0000000..ace44f7 --- /dev/null +++ b/tests/root5/sys/block/sdg/stat @@ -0,0 +1 @@ +129 6 9848 2832 4 0 34 70 0 93 3724 0 0 0 0