]> granicus.if.org Git - sysstat/commitdiff
Simplify/merge non regression tests
authorSebastien GODARD <sysstat@users.noreply.github.com>
Sat, 10 Oct 2020 07:00:01 +0000 (09:00 +0200)
committerSebastien GODARD <sysstat@users.noreply.github.com>
Sat, 10 Oct 2020 07:00:01 +0000 (09:00 +0200)
Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
474 files changed:
tests/00130
tests/00131
tests/00132
tests/00134 [deleted file]
tests/00136 [deleted file]
tests/00137 [deleted file]
tests/00160
tests/00161
tests/00164 [deleted file]
tests/00166 [deleted file]
tests/00170
tests/00172 [deleted file]
tests/00180
tests/00182 [deleted file]
tests/00184
tests/00186 [deleted file]
tests/00188
tests/00189 [deleted file]
tests/00190
tests/00192 [deleted file]
tests/00205
tests/00208 [deleted file]
tests/00220
tests/00225 [deleted file]
tests/00235
tests/00238 [deleted file]
tests/00500
tests/00501 [deleted file]
tests/00510
tests/00511 [deleted file]
tests/00515
tests/00516 [deleted file]
tests/00520
tests/00521 [deleted file]
tests/00530
tests/00531 [deleted file]
tests/00540
tests/00541 [deleted file]
tests/00542
tests/00543 [deleted file]
tests/00545
tests/00546 [deleted file]
tests/00550
tests/00551 [deleted file]
tests/00555
tests/00557 [deleted file]
tests/00560
tests/00561 [deleted file]
tests/00570
tests/00571 [deleted file]
tests/00580
tests/00582 [deleted file]
tests/00605
tests/00607 [deleted file]
tests/00608
tests/00609 [deleted file]
tests/00615
tests/00617 [deleted file]
tests/00625
tests/00627 [deleted file]
tests/00650
tests/00655 [deleted file]
tests/00660
tests/00662 [deleted file]
tests/00664
tests/00665 [deleted file]
tests/00700
tests/00702 [deleted file]
tests/00720
tests/00722 [deleted file]
tests/00750
tests/00752 [deleted file]
tests/00770
tests/00772 [deleted file]
tests/00780
tests/00781 [deleted file]
tests/00784
tests/00785 [deleted file]
tests/00787
tests/00788 [deleted file]
tests/00790
tests/00791 [deleted file]
tests/00795
tests/00796 [deleted file]
tests/00800
tests/00802 [deleted file]
tests/00810
tests/00812 [deleted file]
tests/00820
tests/00822 [deleted file]
tests/00830
tests/00832 [deleted file]
tests/00840
tests/00842 [deleted file]
tests/00850
tests/00852 [deleted file]
tests/00860
tests/00862 [deleted file]
tests/00870
tests/00872 [deleted file]
tests/00880
tests/00882 [deleted file]
tests/00900
tests/00902 [deleted file]
tests/00904
tests/00905 [deleted file]
tests/00906
tests/00907 [deleted file]
tests/00910
tests/00912 [deleted file]
tests/00920
tests/00922 [deleted file]
tests/00930
tests/00932 [deleted file]
tests/00940
tests/00942 [deleted file]
tests/00950
tests/00952 [deleted file]
tests/00954
tests/00956 [deleted file]
tests/00958
tests/00959 [deleted file]
tests/00960
tests/00962 [deleted file]
tests/00964
tests/00966 [deleted file]
tests/00968
tests/00969 [deleted file]
tests/00970
tests/00972 [deleted file]
tests/00982
tests/00984 [deleted file]
tests/01012
tests/01014 [deleted file]
tests/01100
tests/01102 [deleted file]
tests/01110
tests/01112 [deleted file]
tests/01120
tests/01122 [deleted file]
tests/01150
tests/01152 [deleted file]
tests/01210
tests/01212 [deleted file]
tests/01220
tests/01222 [deleted file]
tests/01240
tests/01242 [deleted file]
tests/01250
tests/01252 [deleted file]
tests/01310
tests/01312 [deleted file]
tests/01314
tests/01316 [deleted file]
tests/01318
tests/01319 [deleted file]
tests/01330
tests/01332 [deleted file]
tests/01335
tests/01337 [deleted file]
tests/01340
tests/01342 [deleted file]
tests/01352
tests/01355
tests/01360
tests/01362 [deleted file]
tests/01372
tests/01375 [deleted file]
tests/01382
tests/01385 [deleted file]
tests/01405
tests/01406 [deleted file]
tests/01500
tests/01505 [deleted file]
tests/01510
tests/01515 [deleted file]
tests/01520
tests/01525 [deleted file]
tests/01530
tests/01535 [deleted file]
tests/01540
tests/01545 [deleted file]
tests/01550
tests/01555 [deleted file]
tests/01610
tests/01615 [deleted file]
tests/01620
tests/01625 [deleted file]
tests/01630
tests/01635 [deleted file]
tests/01640
tests/01645 [deleted file]
tests/01650
tests/01655 [deleted file]
tests/01660
tests/01665 [deleted file]
tests/01700
tests/01705 [deleted file]
tests/01710
tests/01715 [deleted file]
tests/01720
tests/01725 [deleted file]
tests/02010
tests/02015 [deleted file]
tests/02020
tests/02025 [deleted file]
tests/02030
tests/02035 [deleted file]
tests/02040
tests/02045 [deleted file]
tests/02050
tests/02055 [deleted file]
tests/02060
tests/02065 [deleted file]
tests/02070
tests/02075 [deleted file]
tests/02080
tests/02085 [deleted file]
tests/02110
tests/02115 [deleted file]
tests/02120
tests/02125 [deleted file]
tests/02130
tests/02135 [deleted file]
tests/02140
tests/02145 [deleted file]
tests/02150
tests/02155 [deleted file]
tests/02160
tests/02165 [deleted file]
tests/02170
tests/02175 [deleted file]
tests/02180
tests/02185 [deleted file]
tests/02210
tests/02215 [deleted file]
tests/02220
tests/02225 [deleted file]
tests/02230
tests/02235 [deleted file]
tests/02240
tests/02245 [deleted file]
tests/02250
tests/02255 [deleted file]
tests/02260
tests/02265 [deleted file]
tests/02270
tests/02275 [deleted file]
tests/02310
tests/02315 [deleted file]
tests/02320
tests/02325 [deleted file]
tests/02340
tests/02345 [deleted file]
tests/02370
tests/02375 [deleted file]
tests/02380
tests/02385 [deleted file]
tests/02410
tests/02415 [deleted file]
tests/02420
tests/02425 [deleted file]
tests/02430
tests/02435 [deleted file]
tests/02440
tests/02445 [deleted file]
tests/02450
tests/02455 [deleted file]
tests/02460
tests/02465 [deleted file]
tests/02470
tests/02472 [deleted file]
tests/02474
tests/02476 [deleted file]
tests/02480
tests/02482 [deleted file]
tests/02484
tests/02486 [deleted file]
tests/02600
tests/02605 [deleted file]
tests/02610
tests/02615 [deleted file]
tests/02620
tests/02625 [deleted file]
tests/02630
tests/02635 [deleted file]
tests/02640
tests/02645 [deleted file]
tests/02650
tests/02655 [deleted file]
tests/02660
tests/02665 [deleted file]
tests/02670
tests/02675 [deleted file]
tests/02680
tests/02685 [deleted file]
tests/02690
tests/02695 [deleted file]
tests/02696
tests/02697 [deleted file]
tests/02698
tests/02699 [deleted file]
tests/02700
tests/02705 [deleted file]
tests/02710
tests/02715 [deleted file]
tests/02720
tests/02725 [deleted file]
tests/02730
tests/02735 [deleted file]
tests/02740
tests/02745 [deleted file]
tests/02750
tests/02755 [deleted file]
tests/02800
tests/02805 [deleted file]
tests/02900
tests/02902 [deleted file]
tests/02905
tests/02907 [deleted file]
tests/02910
tests/02912 [deleted file]
tests/02920
tests/02922 [deleted file]
tests/02925
tests/02927 [deleted file]
tests/02930
tests/02932 [deleted file]
tests/02935
tests/02937 [deleted file]
tests/02940
tests/02942 [deleted file]
tests/02945
tests/02947 [deleted file]
tests/02950
tests/02952 [deleted file]
tests/02955
tests/02957 [deleted file]
tests/03000
tests/03002 [deleted file]
tests/03010
tests/03012 [deleted file]
tests/03020
tests/03022 [deleted file]
tests/03030
tests/03032 [deleted file]
tests/03040
tests/03042 [deleted file]
tests/03050
tests/03055 [deleted file]
tests/03060
tests/03065 [deleted file]
tests/03070
tests/03075 [deleted file]
tests/04000
tests/04005 [deleted file]
tests/04010
tests/04015 [deleted file]
tests/04020
tests/04025 [deleted file]
tests/04030
tests/04035 [deleted file]
tests/04040
tests/04045 [deleted file]
tests/04500
tests/04505 [deleted file]
tests/04510
tests/04515 [deleted file]
tests/04520
tests/04525 [deleted file]
tests/04530
tests/04535 [deleted file]
tests/04540
tests/04545 [deleted file]
tests/04550
tests/04555 [deleted file]
tests/04560
tests/04565 [deleted file]
tests/05000
tests/05005 [deleted file]
tests/05010
tests/05015 [deleted file]
tests/05020
tests/05025 [deleted file]
tests/05030
tests/05035 [deleted file]
tests/05040
tests/05045 [deleted file]
tests/05050
tests/05055 [deleted file]
tests/05060
tests/05065 [deleted file]
tests/05070
tests/05075 [deleted file]
tests/05080
tests/05085 [deleted file]
tests/05090
tests/05095 [deleted file]
tests/05100
tests/05105 [deleted file]
tests/05110
tests/05115 [deleted file]
tests/05120
tests/05125 [deleted file]
tests/05130
tests/05135 [deleted file]
tests/05140
tests/05145 [deleted file]
tests/05150
tests/05155 [deleted file]
tests/05160
tests/05165 [deleted file]
tests/05170
tests/05175 [deleted file]
tests/05180
tests/05185 [deleted file]
tests/05190
tests/05195 [deleted file]
tests/05200
tests/05205 [deleted file]
tests/05210
tests/05215 [deleted file]
tests/05220
tests/05225 [deleted file]
tests/05230
tests/05235 [deleted file]
tests/05240
tests/05245 [deleted file]
tests/05250
tests/05255 [deleted file]
tests/05260
tests/05265 [deleted file]
tests/05270
tests/05275 [deleted file]
tests/05280
tests/05285 [deleted file]
tests/05290
tests/05295 [deleted file]
tests/05300
tests/05305 [deleted file]
tests/05310
tests/05315 [deleted file]
tests/05320
tests/05325 [deleted file]
tests/05330
tests/05335 [deleted file]
tests/05340
tests/05345 [deleted file]
tests/05346
tests/05347 [deleted file]
tests/05350
tests/05355 [deleted file]
tests/05360
tests/05365 [deleted file]
tests/05370
tests/05375 [deleted file]
tests/05380
tests/05385 [deleted file]
tests/05390
tests/05395 [deleted file]
tests/05400
tests/05405 [deleted file]
tests/05410
tests/05415 [deleted file]
tests/05420
tests/05425 [deleted file]
tests/05430
tests/05435 [deleted file]
tests/05440
tests/05445 [deleted file]
tests/05450
tests/05455 [deleted file]
tests/TLIST
tests/expected.iostat+f-alt-pALL-ms [new file with mode: 0644]

index 641ff2136dcfed15f02567cc2baa5bf96a1c7070..4e30bc1edfa489626d655c0db1c137d9e414987c 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -C -u -P ALL -f tests/data.tmp > tests/out.sar-u.tmp
+LC_ALL=C TZ=GMT ./sar -C -u -P ALL -f tests/data.tmp > tests/out.sar-u.tmp && diff -u tests/expected.sar-u tests/out.sar-u.tmp
index 98961b6a6cf4bc6a03150f5c68862948239a9d9f..34526024cb447e702980c41d91fd11d42c4b4303 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -bBdFHqSvwWy -I SUM -I ALL -m CPU -n ALL -r ALL -u ALL -P ALL -f tests/data.tmp > tests/out.sar-all.tmp
+LC_ALL=C TZ=GMT ./sar -bBdFHqSvwWy -I SUM -I ALL -m CPU -n ALL -r ALL -u ALL -P ALL -f tests/data.tmp > tests/out.sar-all.tmp && diff -u tests/expected.sar-all tests/out.sar-all.tmp
index 195e10344736a7763bb9906135380192a0e21e4e..bd6bdbdc08d9a139349041e8995e337ff8045e08 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -A -I 2-5 -P 3 -f tests/data.tmp > tests/out3.sar-all.tmp
+LC_ALL=C TZ=GMT ./sar -A -I 2-5 -P 3 -f tests/data.tmp > tests/out3.sar-all.tmp && diff -u tests/expected3.sar-all tests/out3.sar-all.tmp
diff --git a/tests/00134 b/tests/00134
deleted file mode 100644 (file)
index aba87f4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-u.tmp tests/expected.sar-u
diff --git a/tests/00136 b/tests/00136
deleted file mode 100644 (file)
index de16faa..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-all.tmp tests/expected.sar-all
diff --git a/tests/00137 b/tests/00137
deleted file mode 100644 (file)
index b0e3f50..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out3.sar-all.tmp tests/expected3.sar-all
index 123b8c6c2bea7aaeec1a3a41573eabc9540ddc43..21d5b008248cb51a69e24ad839e62ae2fbd67417 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -C -u -P ALL -f tests/data.tmp > tests/out2.sar-u.tmp
+LC_ALL=C TZ=GMT ./sar -C -u -P ALL -f tests/data.tmp > tests/out2.sar-u.tmp && diff -u tests/expected2.sar-u tests/out2.sar-u.tmp
index 3e958689cbb589ec0de6976b01d607492160dee3..a1b7f29b5a40fbba2cff2c1a85307eaff222ed1c 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -A -f tests/data.tmp > tests/out2.sar-all.tmp
+LC_ALL=C TZ=GMT ./sar -A -f tests/data.tmp > tests/out2.sar-all.tmp && diff -u tests/expected2.sar-all tests/out2.sar-all.tmp
diff --git a/tests/00164 b/tests/00164
deleted file mode 100644 (file)
index 6d375a1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out2.sar-u.tmp tests/expected2.sar-u
diff --git a/tests/00166 b/tests/00166
deleted file mode 100644 (file)
index a69608c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out2.sar-all.tmp tests/expected2.sar-all
index e3ebfc2512ba51a81648ef215a4546f3054208b9..6f070ab4500261fea1bbb1eb78fa75de6d00bd21 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar --pretty -d -f tests/data.tmp > tests/out.sar-pretty.tmp
+LC_ALL=C TZ=GMT ./sar --pretty -d -f tests/data.tmp > tests/out.sar-pretty.tmp && diff -u tests/expected.sar-pretty tests/out.sar-pretty.tmp
diff --git a/tests/00172 b/tests/00172
deleted file mode 100644 (file)
index 263f8fa..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-pretty.tmp tests/expected.sar-pretty
index 24a44088154a2f096fead92aad2fcf49c236d7e4..ab497f222c84bc70af6d73d4b167ed49f0c9e3b7 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT S_TIME_FORMAT=ISO S_COLORS= ./sar -C -u --getenv -f tests/data.tmp > tests/out.sar-ISO.tmp
+LC_ALL=C TZ=GMT S_TIME_FORMAT=ISO S_COLORS= ./sar -C -u --getenv -f tests/data.tmp > tests/out.sar-ISO.tmp && diff -u tests/expected.sar-ISO tests/out.sar-ISO.tmp
diff --git a/tests/00182 b/tests/00182
deleted file mode 100644 (file)
index c4dddaa..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-ISO.tmp tests/expected.sar-ISO
index 6870f619c4c92d99d89873bdf4cb52d25f0dfe34..de6f89145a984bb072490da086409e00447660c5 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT S_TIME_FORMAT=ISO S_COLORS=never ./sar -C -u --getenv -f tests/data.tmp > tests/out.sar-never.tmp
+LC_ALL=C TZ=GMT S_TIME_FORMAT=ISO S_COLORS=never ./sar -C -u --getenv -f tests/data.tmp > tests/out.sar-never.tmp && diff -u tests/expected.sar-autonever tests/out.sar-never.tmp
diff --git a/tests/00186 b/tests/00186
deleted file mode 100644 (file)
index f485c03..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-never.tmp tests/expected.sar-autonever
index 498f0f9a20a3bb4cc94302b0f46329994584968b..346191901d869b86a5005a9179570c75aad3298f 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT S_TIME_FORMAT=ISO S_COLORS=auto ./sar -C -u --getenv -f tests/data.tmp > tests/out.sar-auto.tmp
+LC_ALL=C TZ=GMT S_TIME_FORMAT=ISO S_COLORS=auto ./sar -C -u --getenv -f tests/data.tmp > tests/out.sar-auto.tmp && diff -u tests/expected.sar-autonever tests/out.sar-auto.tmp
diff --git a/tests/00189 b/tests/00189
deleted file mode 100644 (file)
index 2a5efad..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-auto.tmp tests/expected.sar-autonever
index 3ad2b6a7a27dec3c68b0a2fdf81a56f7f69986af..6cf7b1f2dd0de4a17a76eee833538058337bf59c 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT S_TIME_FORMAT= S_COLORS=always S_COLORS_SGR="C=33;22:H=31;1:I=32;22:M=35;1:N=34;1:R=31;22:Z=36;22" ./sar -C -u --getenv -f tests/data.tmp > tests/out.sar-always.tmp
+LC_ALL=C TZ=GMT S_TIME_FORMAT= S_COLORS=always S_COLORS_SGR="C=33;22:H=31;1:I=32;22:M=35;1:N=34;1:R=31;22:Z=36;22" ./sar -C -u --getenv -f tests/data.tmp > tests/out.sar-always.tmp && diff -u tests/expected.sar-always tests/out.sar-always.tmp
diff --git a/tests/00192 b/tests/00192
deleted file mode 100644 (file)
index 2e03242..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-always.tmp tests/expected.sar-always
index 2ffc1b1450478519ba4c7f55548b18ec3d2f3faf..12579dc3f33569c1f096b97d4f354bdaf58b10a1 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -f tests/sa18 > tests/out.sa1.tmp
+LC_ALL=C TZ=GMT ./sar -f tests/sa18 > tests/out.sa1.tmp && diff -u tests/expected.sa1 tests/out.sa1.tmp
diff --git a/tests/00208 b/tests/00208
deleted file mode 100644 (file)
index a32373d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sa1.tmp tests/expected.sa1
index 7908fd4f1eeb70606dcf6618db022ffa02925c6f..644b9a71512536ba03ee26cc2834c36621e7bddf 100644 (file)
@@ -6,4 +6,4 @@ then
        mv tests/sa18 tests/sa${DATE}
 fi
 echo sa2: File is sa${DATE}
-LC_ALL=C TZ=GMT ./sa2 -A && mv tests/sar${DATE} tests/out.sa2.tmp && rm -f tests/sa${DATE}
+LC_ALL=C TZ=GMT ./sa2 -A && mv tests/sar${DATE} tests/out.sa2.tmp && rm -f tests/sa${DATE} && diff -u tests/expected.sa2 tests/out.sa2.tmp
diff --git a/tests/00225 b/tests/00225
deleted file mode 100644 (file)
index dffce86..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sa2.tmp tests/expected.sa2
index f26ef0adb16fb9b4d5918b1ed4f616f3510d2fa9..041a898a87653c116043a3d925fd0739ef198fb5 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -f tests/sa01 -C > tests/out.sa1-sleep.tmp
+LC_ALL=C TZ=GMT ./sar -f tests/sa01 -C > tests/out.sa1-sleep.tmp && diff -u tests/expected.sa1-sleep tests/out.sa1-sleep.tmp
diff --git a/tests/00238 b/tests/00238
deleted file mode 100644 (file)
index 8cad84f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sa1-sleep.tmp tests/expected.sa1-sleep
index e8c372548ac5d98ebe7b059898def18ccdca08f1..f021be2b63ba6448c0b3dff801389f740b53a8f9 100644 (file)
@@ -1 +1 @@
-LC_ALL=C ./sadf -p tests/data.tmp -C -- -A > tests/out.sadf-p.tmp
+LC_ALL=C ./sadf -p tests/data.tmp -C -- -A > tests/out.sadf-p.tmp && diff -u tests/expected.sadf-p tests/out.sadf-p.tmp
diff --git a/tests/00501 b/tests/00501
deleted file mode 100644 (file)
index b37ef22..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sadf-p.tmp tests/expected.sadf-p
index 55c6facac3652a1a290fe21c28578967d98e0bfd..5d23aa3677987de965bd92b803b537b4357a1cb0 100644 (file)
@@ -1 +1 @@
-LC_ALL=C ./sadf -d tests/data.tmp -C -- -A > tests/out.sadf-d.tmp
+LC_ALL=C ./sadf -d tests/data.tmp -C -- -A > tests/out.sadf-d.tmp && diff -u tests/expected.sadf-d tests/out.sadf-d.tmp
diff --git a/tests/00511 b/tests/00511
deleted file mode 100644 (file)
index 9b3a2d6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sadf-d.tmp tests/expected.sadf-d
index 540a64d939034f0c598283705cbe37f40b18a034..296a8d538cca4b603314f9b7c50cefd58e358e44 100644 (file)
@@ -1 +1 @@
-LC_ALL=C ./sadf -d tests/data.tmp -- -qu > tests/out.sadf-d-qu.tmp
+LC_ALL=C ./sadf -d tests/data.tmp -- -qu > tests/out.sadf-d-qu.tmp && diff -u tests/expected.sadf-d-qu tests/out.sadf-d-qu.tmp
diff --git a/tests/00516 b/tests/00516
deleted file mode 100644 (file)
index bab7053..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sadf-d-qu.tmp tests/expected.sadf-d-qu
index 60821fba98c5c261f3ed9f4b9c8f9192c085cc7c..5e79a1d676122d240579813b2adf6c6a5b6e473e 100644 (file)
@@ -1 +1 @@
-LC_ALL=C ./sadf -x tests/data.tmp -C -- -A > tests/out.sadf-x.tmp
+LC_ALL=C ./sadf -x tests/data.tmp -C -- -A > tests/out.sadf-x.tmp && diff -u tests/expected.sadf-x tests/out.sadf-x.tmp
diff --git a/tests/00521 b/tests/00521
deleted file mode 100644 (file)
index 9010303..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sadf-x.tmp tests/expected.sadf-x
index f8d5e80dd694c3127014412b2515407837ff6f90..0302fb7b525c6488652faf053d32b5bda9dbf1ca 100644 (file)
@@ -1 +1 @@
-./sadf -j tests/data.tmp -C -- -A > tests/out.sadf-j.tmp
+./sadf -j tests/data.tmp -C -- -A > tests/out.sadf-j.tmp && diff -u tests/expected.sadf-j tests/out.sadf-j.tmp
diff --git a/tests/00531 b/tests/00531
deleted file mode 100644 (file)
index aaa2a34..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sadf-j.tmp tests/expected.sadf-j
index 29d65cc896c5a1807d3a4756d85a3631f6fc1d89..292f22a41d1b026cf5756c3da8db706a9f4da541 100644 (file)
@@ -1 +1 @@
-LC_ALL=C ./sadf -g tests/data.tmp -C -- -A > tests/out.sadf-g.tmp
+LC_ALL=C ./sadf -g tests/data.tmp -C -- -A > tests/out.sadf-g.tmp && diff -u tests/expected.sadf-g tests/out.sadf-g.tmp
diff --git a/tests/00541 b/tests/00541
deleted file mode 100644 (file)
index 315ba97..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sadf-g.tmp tests/expected.sadf-g
index 811c8be33f1229b939c50e714e92fffd9d1f7395..8a1416de3573b3eee0738cac0e8c43cf230e09ad 100644 (file)
@@ -1 +1 @@
-LC_ALL=C ./sadf -O height=370 -g tests/data.tmp > tests/out3.sadf-g.tmp
+LC_ALL=C ./sadf -O height=370 -g tests/data.tmp > tests/out3.sadf-g.tmp && diff -u tests/expected3.sadf-g tests/out3.sadf-g.tmp
diff --git a/tests/00543 b/tests/00543
deleted file mode 100644 (file)
index 3a69be7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out3.sadf-g.tmp tests/expected3.sadf-g
index 091c6af8a336f803569a0f7931960f365f7469e5..ba785bc999071928f5334eb22b477b6652e18290 100644 (file)
@@ -1 +1 @@
-LC_ALL=C ./sadf -g tests/data.tmp -- -F MOUNT > tests/out1.sadf-g.tmp
+LC_ALL=C ./sadf -g tests/data.tmp -- -F MOUNT > tests/out1.sadf-g.tmp && diff -u tests/expected1.sadf-g tests/out1.sadf-g.tmp
diff --git a/tests/00546 b/tests/00546
deleted file mode 100644 (file)
index 1e211d0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out1.sadf-g.tmp tests/expected1.sadf-g
index 68364113ef105b0af7433f3c5c7c63dd6e9ee220..03e02633bd3071af2ebbd546a3595759e38c9c25 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sadf -g -O autoscale,packed,oneday,showidle,showtoc,skipempty,showinfo,bwcol tests/data.tmp -T -C -- -A > tests/out2.sadf-g.tmp
+LC_ALL=C TZ=GMT ./sadf -g -O autoscale,packed,oneday,showidle,showtoc,skipempty,showinfo,bwcol tests/data.tmp -T -C -- -A > tests/out2.sadf-g.tmp && diff -u tests/expected2.sadf-g tests/out2.sadf-g.tmp
diff --git a/tests/00551 b/tests/00551
deleted file mode 100644 (file)
index 7fd9a82..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out2.sadf-g.tmp tests/expected2.sadf-g
index a822e1dd08dc852789640d50ed810e12fa40fdce..e989b8d52338392dd2f2f5d10ea7c0a1f93f2c28 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT S_COLORS_PALETTE="0=000000:1=1a1aff:2=1affb2:3=b21aff:4=1ab2ff:5=ff1a1a:6=ffb31a:7=b2ff1a:8=efefef:9=000000:A=1a1aff:B=1affb2:C=b21aff:D=1ab2ff:E=ff1a1a:F=ffb31a:G=cc3300:H=000000:I=000000:K=ffffff:L=000000:T=000000:W=000000:X=000000" ./sadf -g --getenv -O customcol tests/data.tmp -C > tests/out.sadf-g-cc.tmp
+LC_ALL=C TZ=GMT S_COLORS_PALETTE="0=000000:1=1a1aff:2=1affb2:3=b21aff:4=1ab2ff:5=ff1a1a:6=ffb31a:7=b2ff1a:8=efefef:9=000000:A=1a1aff:B=1affb2:C=b21aff:D=1ab2ff:E=ff1a1a:F=ffb31a:G=cc3300:H=000000:I=000000:K=ffffff:L=000000:T=000000:W=000000:X=000000" ./sadf -g --getenv -O customcol tests/data.tmp -C > tests/out.sadf-g-cc.tmp && diff -u tests/expected.sadf-g-cc tests/out.sadf-g-cc.tmp
diff --git a/tests/00557 b/tests/00557
deleted file mode 100644 (file)
index ab29661..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sadf-g-cc.tmp tests/expected.sadf-g-cc
index 36b1c34872050951ceec153fa8417522365cb752..a12ec44767e1782d311a151f51f5041bf6396f8e 100644 (file)
@@ -1 +1 @@
-LC_ALL=C ./sadf -H tests/data.tmp > tests/out.sadf-H.tmp
+LC_ALL=C ./sadf -H tests/data.tmp > tests/out.sadf-H.tmp && diff -u tests/expected.sadf-H tests/out.sadf-H.tmp
diff --git a/tests/00561 b/tests/00561
deleted file mode 100644 (file)
index 0cc9fbe..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sadf-H.tmp tests/expected.sadf-H
index b71c92fc6f89d73e4465792cce596dcd2f8f1324..e4cdee848ae5e04b59b826d699983a341577c55a 100644 (file)
@@ -1 +1 @@
-./sadf -r -O debug tests/data.tmp -C -- -A > tests/out.sadf-r.tmp
+./sadf -r -O debug tests/data.tmp -C -- -A > tests/out.sadf-r.tmp && diff -u tests/expected.sadf-r tests/out.sadf-r.tmp
diff --git a/tests/00571 b/tests/00571
deleted file mode 100644 (file)
index 888e09e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sadf-r.tmp tests/expected.sadf-r
index 0bfe06aa6a207d9e6be7ca0f37c77bc8b182c1ab..a9965ff8b84cb9785e5e0aa6814fd0837526b41d 100644 (file)
@@ -1 +1 @@
-LC_ALL=C ./sadf -d -s 13:20:20 -e 13:20:40 --iface=enp6s1 --dev=sda --fs=/dev/sda6 tests/data.tmp -- -n DEV -Fdp > tests/out.sadf-se.tmp
+LC_ALL=C ./sadf -d -s 13:20:20 -e 13:20:40 --iface=enp6s1 --dev=sda --fs=/dev/sda6 tests/data.tmp -- -n DEV -Fdp > tests/out.sadf-se.tmp && diff -u tests/expected.sadf-se tests/out.sadf-se.tmp
diff --git a/tests/00582 b/tests/00582
deleted file mode 100644 (file)
index 2bb79f6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sadf-se.tmp tests/expected.sadf-se
index 9079765f0f5a60771b1b01b314110e7f38588938..0b006d2faa182bab84049de6474b651488675ccb 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -C -A -f tests/data-9.1.6.tmp > tests/out.data-9.1.6.tmp
+LC_ALL=C TZ=GMT ./sar -C -A -f tests/data-9.1.6.tmp > tests/out.data-9.1.6.tmp && diff -u tests/expected.data-9.1.6 tests/out.data-9.1.6.tmp
diff --git a/tests/00607 b/tests/00607
deleted file mode 100644 (file)
index d9304fe..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.data-9.1.6.tmp tests/expected.data-9.1.6
index d861ce56eb9e89a2512b647aa585b7228c827b29..41acecd211252b271fb82bebd3b7398878109972 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -f tests/data-9.1.6-hz.tmp > tests/out.data-9.1.6-hz.tmp
+LC_ALL=C TZ=GMT ./sar -f tests/data-9.1.6-hz.tmp > tests/out.data-9.1.6-hz.tmp && diff -u tests/expected.data-9.1.6-hz tests/out.data-9.1.6-hz.tmp
diff --git a/tests/00609 b/tests/00609
deleted file mode 100644 (file)
index 92da97e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.data-9.1.6-hz.tmp tests/expected.data-9.1.6-hz
index 0d8c4ffdf81488b9dcffbf5fdcc05fb78423182b..61a354b04798d0c9355d06a27e1c4c83ee10e9cc 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -C -A -f tests/data-10.3.1.tmp > tests/out.data-10.3.1.tmp
+LC_ALL=C TZ=GMT ./sar -C -A -f tests/data-10.3.1.tmp > tests/out.data-10.3.1.tmp && diff -u tests/expected.data-10.3.1 tests/out.data-10.3.1.tmp
diff --git a/tests/00617 b/tests/00617
deleted file mode 100644 (file)
index c4e171c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.data-10.3.1.tmp tests/expected.data-10.3.1
index e526fe9472f4a16fe169048ce08d4438ca533a51..ffcad01b86638449c16839d47b8a750a0fdbf073 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -C -A -f tests/data-11.6.5.tmp > tests/out.data-11.6.5.tmp
+LC_ALL=C TZ=GMT ./sar -C -A -f tests/data-11.6.5.tmp > tests/out.data-11.6.5.tmp && diff -u tests/expected.data-11.6.5 tests/out.data-11.6.5.tmp
diff --git a/tests/00627 b/tests/00627
deleted file mode 100644 (file)
index c3ea756..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.data-11.6.5.tmp tests/expected.data-11.6.5
index 284f325cc112130ee9dbfe8b59eb28c0e9f10636..957c593bed27deb693f4e95ed1cf63e09c06ccbe 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -AC -f tests/data-12.0.0 > tests/out.data-12.0.0.tmp
+LC_ALL=C TZ=GMT ./sar -AC -f tests/data-12.0.0 > tests/out.data-12.0.0.tmp && diff -u tests/expected.data-12.0.0 tests/out.data-12.0.0.tmp
diff --git a/tests/00655 b/tests/00655
deleted file mode 100644 (file)
index 0fcc241..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.data-12.0.0.tmp tests/expected.data-12.0.0
index a2698c74946a3a5c2e943e8a1289b27c4f558a33..2b41579e80cc0032b4b7e1689cc32ea2a7e519ed 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sadf -H tests/data-9.1.6-hz.tmp > tests/out.sadf-H-hz.tmp
+LC_ALL=C TZ=GMT ./sadf -H tests/data-9.1.6-hz.tmp > tests/out.sadf-H-hz.tmp && diff -u tests/expected.sadf-H-hz tests/out.sadf-H-hz.tmp
diff --git a/tests/00662 b/tests/00662
deleted file mode 100644 (file)
index 9f7853c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sadf-H-hz.tmp tests/expected.sadf-H-hz
index 9554051fa9cfc14d6b80ea52104ddd7ddc44fa8d..de54af90fd77d06d9ddc6f48cdceaf324e5bf719 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sadf -r -O debug tests/data-9.1.6-hz.tmp > tests/out.sadf-r-hz.tmp
+LC_ALL=C TZ=GMT ./sadf -r -O debug tests/data-9.1.6-hz.tmp > tests/out.sadf-r-hz.tmp && diff -u tests/expected.sadf-r-hz tests/out.sadf-r-hz.tmp
diff --git a/tests/00665 b/tests/00665
deleted file mode 100644 (file)
index ca6766f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sadf-r-hz.tmp tests/expected.sadf-r-hz
index 932a2c114e4c5f6c6ac2bf27a688ba079dff8da3..69ec4abedd64f66f8d22c500c33f40ff6904702c 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -C -A -f tests/data-ppc-11.7.2 > tests/out.data-ppc-11.7.2.tmp
+LC_ALL=C TZ=GMT ./sar -C -A -f tests/data-ppc-11.7.2 > tests/out.data-ppc-11.7.2.tmp && diff -u tests/expected.data-ppc-11.7.2 tests/out.data-ppc-11.7.2.tmp
diff --git a/tests/00702 b/tests/00702
deleted file mode 100644 (file)
index 49ed58d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.data-ppc-11.7.2.tmp tests/expected.data-ppc-11.7.2
index 8bd402ecb4ec948a9526c7dcd235048593b1d199..ad4eeb078a4c65534a5f4f4dc6171f2d417a3252 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -C -f tests/data-non-printable > tests/out.sar-non-printable.tmp
+LC_ALL=C TZ=GMT ./sar -C -f tests/data-non-printable > tests/out.sar-non-printable.tmp && diff -u tests/expected.sar-non-printable tests/out.sar-non-printable.tmp
diff --git a/tests/00722 b/tests/00722
deleted file mode 100644 (file)
index f425599..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-non-printable.tmp tests/expected.sar-non-printable
index 14c4e034a0da0f71a0a42b58eaaabe955ea5985a..b6a7d4bff26617027fd8de74bccc73a4a5e10793 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./tests/ini/inisar -C -A -f tests/data.tmp > tests/out.data-ini.tmp
+LC_ALL=C TZ=GMT ./tests/ini/inisar -C -A -f tests/data.tmp > tests/out.data-ini.tmp && diff -u tests/expected.data-ini tests/out.data-ini.tmp
diff --git a/tests/00752 b/tests/00752
deleted file mode 100644 (file)
index 77fa785..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.data-ini.tmp tests/expected.data-ini
index 138a12329e529df92cf89219365d31618e0db790..c834f7479d2b335e0579b047e57a35e82c0a30c8 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -A -f tests/data-extra-12.1.7 > tests/out.data-extra-12.1.7.tmp
+LC_ALL=C TZ=GMT ./sar -A -f tests/data-extra-12.1.7 > tests/out.data-extra-12.1.7.tmp && diff -u tests/expected.data-extra-12.1.7 tests/out.data-extra-12.1.7.tmp
diff --git a/tests/00772 b/tests/00772
deleted file mode 100644 (file)
index bc84724..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.data-extra-12.1.7.tmp tests/expected.data-extra-12.1.7
index c247090a934b47f2ef2f4da98f6348c8b67ca13a..4ece95954dcf4f8605c3fad64594d943687b0b49 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -P ALL -f tests/data-ukwn > tests/out.sar-data-ukwn.tmp
+LC_ALL=C TZ=GMT ./sar -P ALL -f tests/data-ukwn > tests/out.sar-data-ukwn.tmp && diff -u tests/expected.sar-data-ukwn tests/out.sar-data-ukwn.tmp
diff --git a/tests/00781 b/tests/00781
deleted file mode 100644 (file)
index c7aa7dc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-data-ukwn.tmp tests/expected.sar-data-ukwn
index b806500e70e6d50ac31704e13d09b55fff6fbd3e..524595f0398ef46b994d34c511c86c01b7badcd9 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -w -f tests/data-ukwn > tests/out2.sar-data-ukwn.tmp
+LC_ALL=C TZ=GMT ./sar -w -f tests/data-ukwn > tests/out2.sar-data-ukwn.tmp && diff -u tests/expected2.sar-data-ukwn tests/out2.sar-data-ukwn.tmp
diff --git a/tests/00785 b/tests/00785
deleted file mode 100644 (file)
index f9d83a0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out2.sar-data-ukwn.tmp tests/expected2.sar-data-ukwn
index 9ef9dc0169c97fcf9e28de6a7cf497665c50d155..59e224bed49ea230a4be89b9618dc5c70fb62b25 100644 (file)
@@ -1 +1 @@
-LC_ALL=C ./sadf -H tests/data-ukwn > tests/out.sadf-data-ukwn.tmp
+LC_ALL=C ./sadf -H tests/data-ukwn > tests/out.sadf-data-ukwn.tmp && diff -u tests/expected.sadf-data-ukwn tests/out.sadf-data-ukwn.tmp
diff --git a/tests/00788 b/tests/00788
deleted file mode 100644 (file)
index 3268640..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sadf-data-ukwn.tmp tests/expected.sadf-data-ukwn
index afa2ff6591d5de7fbbf74062ec78501ef2ed38a7..1f95363b27cf9dd8d33abe927d723d8c345a3d4c 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -A -f tests/data-ukwn0 > tests/out.sar-data-ukwn0.tmp
+LC_ALL=C TZ=GMT ./sar -A -f tests/data-ukwn0 > tests/out.sar-data-ukwn0.tmp && diff -u tests/expected2.sar-data-ukwn tests/out.sar-data-ukwn0.tmp
diff --git a/tests/00791 b/tests/00791
deleted file mode 100644 (file)
index eb49447..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-data-ukwn0.tmp tests/expected2.sar-data-ukwn
index 53597815cbaa6639f010ba7dbcbea4441b2d4da5..8edd441e86d28dfda262188f342743b84a576802 100644 (file)
@@ -1 +1 @@
-LC_ALL=C ./sadf -H tests/data-ukwn0 > tests/out.sadf-data-ukwn0.tmp
+LC_ALL=C ./sadf -H tests/data-ukwn0 > tests/out.sadf-data-ukwn0.tmp && diff -u tests/expected.sadf-data-ukwn0 tests/out.sadf-data-ukwn0.tmp
diff --git a/tests/00796 b/tests/00796
deleted file mode 100644 (file)
index fbb8b21..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sadf-data-ukwn0.tmp tests/expected.sadf-data-ukwn0
index 0f196473b1f58039fed7b599676e9f7f345a1c22..1196761587051878320e07ea20996a8a771d4d13 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar --iface=lo,enp6s0,eth0 -n DEV,EDEV -f tests/data.tmp > tests/out.sar-iface.tmp
+LC_ALL=C TZ=GMT ./sar --iface=lo,enp6s0,eth0 -n DEV,EDEV -f tests/data.tmp > tests/out.sar-iface.tmp && diff -u tests/expected.sar-iface tests/out.sar-iface.tmp
diff --git a/tests/00802 b/tests/00802
deleted file mode 100644 (file)
index 08d45eb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-iface.tmp tests/expected.sar-iface
index f1aee38548099faac955c96f23509824ef20e52b..9624b470f0f861ece914e896f15ca05c53da86b1 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar --dev=sda -dp -f tests/data.tmp > tests/out.sar-dev.tmp
+LC_ALL=C TZ=GMT ./sar --dev=sda -dp -f tests/data.tmp > tests/out.sar-dev.tmp && diff -u tests/expected.sar-dev tests/out.sar-dev.tmp
diff --git a/tests/00812 b/tests/00812
deleted file mode 100644 (file)
index 1954ab6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-dev.tmp tests/expected.sar-dev
index bfa00e9ff60cc2a9fed533c4ded28251aa100bfa..b864e7b0ddd10955c81f93358f52f423f23c59f1 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar --fs=/dev/sda6,/dev/foo -F -f tests/data.tmp > tests/out.sar-fs.tmp
+LC_ALL=C TZ=GMT ./sar --fs=/dev/sda6,/dev/foo -F -f tests/data.tmp > tests/out.sar-fs.tmp && diff -u tests/expected.sar-fs tests/out.sar-fs.tmp
diff --git a/tests/00822 b/tests/00822
deleted file mode 100644 (file)
index 42a943c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-fs.tmp tests/expected.sar-fs
index 0e74bdd446caf31e558711e010f55c31f5512a74..5032d673df30db61340d2240b9f8c4b3b77ba441 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar --dec=0 -A -f tests/data.tmp > tests/out.sar-dec.tmp
+LC_ALL=C TZ=GMT ./sar --dec=0 -A -f tests/data.tmp > tests/out.sar-dec.tmp && diff -u tests/expected.sar-dec tests/out.sar-dec.tmp
diff --git a/tests/00832 b/tests/00832
deleted file mode 100644 (file)
index f8aedf1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-dec.tmp tests/expected.sar-dec
index 96862a50af8cceacffe85090c0c8fd7a6e047312..69238977906130d8cacd72c6c07908b607526f36 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar --human -A -f tests/data.tmp > tests/out.sar-human.tmp
+LC_ALL=C TZ=GMT ./sar --human -A -f tests/data.tmp > tests/out.sar-human.tmp && diff -u tests/expected.sar-human tests/out.sar-human.tmp
diff --git a/tests/00842 b/tests/00842
deleted file mode 100644 (file)
index e58df72..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-human.tmp tests/expected.sar-human
index d55c537d9a37e9145f9a0d8f9e079935702130ee..b302eda18419d774d60217489aa942f458575977 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -s 13:20:20 -e 13:20:40 -f tests/data.tmp > tests/out.sar-se.tmp
+LC_ALL=C TZ=GMT ./sar -s 13:20:20 -e 13:20:40 -f tests/data.tmp > tests/out.sar-se.tmp && diff -u tests/expected.sar-se tests/out.sar-se.tmp
diff --git a/tests/00852 b/tests/00852
deleted file mode 100644 (file)
index 230dc40..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-se.tmp tests/expected.sar-se
index 9471d91edb56a6a4ad7d6a853e83f8b9e30a7be0..5cfc451a53b11a29827a3c71ddffdf6572061f5c 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -i 60 -uw -P ALL -f tests/data.tmp > tests/out.sar-i.tmp
+LC_ALL=C TZ=GMT ./sar -i 60 -uw -P ALL -f tests/data.tmp > tests/out.sar-i.tmp && diff -u tests/expected.sar-i tests/out.sar-i.tmp
diff --git a/tests/00862 b/tests/00862
deleted file mode 100644 (file)
index 82b5b30..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-i.tmp tests/expected.sar-i
index ddaa73cf42c639e8a2ea31236a22e2f976a9a857..0799e428f7b796004f71551485556d36c2c8aea9 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar 60 -uw -P ALL -f tests/data.tmp > tests/out2.sar-i.tmp
+LC_ALL=C TZ=GMT ./sar 60 -uw -P ALL -f tests/data.tmp > tests/out2.sar-i.tmp && diff -u tests/expected.sar-i tests/out2.sar-i.tmp
diff --git a/tests/00872 b/tests/00872
deleted file mode 100644 (file)
index 4c58dfe..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out2.sar-i.tmp tests/expected.sar-i
index 276b86c32e3c2b5b61a3c115e0f39074722e9ca6..a3b85fc49255740a7bb95938e31bcd19b0d3dfca 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar 60 2 -f tests/data.tmp > tests/out3.sar-i.tmp
+LC_ALL=C TZ=GMT ./sar 60 2 -f tests/data.tmp > tests/out3.sar-i.tmp && diff -u tests/expected3.sar-i tests/out3.sar-i.tmp
diff --git a/tests/00882 b/tests/00882
deleted file mode 100644 (file)
index 8fb9018..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out3.sar-i.tmp tests/expected3.sar-i
index 4876b702d4f0c938423e4a9e2b88cca8e56b6042..48abab3a0bc389b4d5a50c6cf2225b88fca82e86 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./sar -dh -j UUID -f tests/data.tmp > tests/out.sar-jUUID.tmp
+LC_ALL=C TZ=GMT ./sar -dh -j UUID -f tests/data.tmp > tests/out.sar-jUUID.tmp && diff -u tests/expected.sar-jUUID tests/out.sar-jUUID.tmp
diff --git a/tests/00902 b/tests/00902
deleted file mode 100644 (file)
index 6290859..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-jUUID.tmp tests/expected.sar-jUUID
index 870763702d44ec4fc74f3468aa709e2a35db8fb6..345f0bebe75e8d23d4c19b37cdd913beb00494c3 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root4 tests/root
-LC_ALL=C TZ=GMT ./sar -dh -j ID -f tests/data.tmp > tests/out.sar-jID.tmp
+LC_ALL=C TZ=GMT ./sar -dh -j ID -f tests/data.tmp > tests/out.sar-jID.tmp && diff -u tests/expected.sar-jID tests/out.sar-jID.tmp
diff --git a/tests/00905 b/tests/00905
deleted file mode 100644 (file)
index 1be259c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-jID.tmp tests/expected.sar-jID
index e7552250343df055de409bac126a423bc4084f21..349c94ed0b9a6fba44507b43a3f96fab6383af4e 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./sar -dh -j SID -f tests/data.tmp > tests/out.sar-jSID.tmp
+LC_ALL=C TZ=GMT ./sar -dh -j SID -f tests/data.tmp > tests/out.sar-jSID.tmp && diff -u tests/expected.sar-jSID tests/out.sar-jSID.tmp
diff --git a/tests/00907 b/tests/00907
deleted file mode 100644 (file)
index 5f144be..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-jSID.tmp tests/expected.sar-jSID
index 87049213186b35c791699134d3e935810b5f2423..27aab70924fcd13f87b5fae53b169aabd4cebab3 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -uw -f tests/data-cd -s 23:59:58 -e 00:00:00 > tests/out.sar-cd.tmp
+LC_ALL=C TZ=GMT ./sar -uw -f tests/data-cd -s 23:59:58 -e 00:00:00 > tests/out.sar-cd.tmp && diff -u tests/expected.sar-cd tests/out.sar-cd.tmp
diff --git a/tests/00912 b/tests/00912
deleted file mode 100644 (file)
index 6bd2ef2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-cd.tmp tests/expected.sar-cd
index 98f60e42629f673a126e7e52eb77a999bdf029de..0b242de9215c1cd58c07872eb3a38976dfe2ac38 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -f tests/data.tmp -e 13:30 -z -n DEV -dp > tests/out.sar-z.tmp
+LC_ALL=C TZ=GMT ./sar -f tests/data.tmp -e 13:30 -z -n DEV -dp > tests/out.sar-z.tmp && diff -u tests/expected.sar-z tests/out.sar-z.tmp
diff --git a/tests/00922 b/tests/00922
deleted file mode 100644 (file)
index 6ed0259..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-z.tmp tests/expected.sar-z
index 0fd13f31ecc5730841e0553d581accddf950eadb..208d73d94c84865b77e2dfacb3f79b9184f0d9ce 100644 (file)
@@ -1,4 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-
-LC_ALL=C TZ=GMT ./sar -ur 0 > tests/out.sar-0.tmp
+LC_ALL=C TZ=GMT ./sar -ur 0 > tests/out.sar-0.tmp && diff -u tests/expected.sar-0 tests/out.sar-0.tmp
diff --git a/tests/00932 b/tests/00932
deleted file mode 100644 (file)
index c1f0f75..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-0.tmp tests/expected.sar-0
index 43fd5220972cddcf575d4fa87e73ce80ec723e0c..58f7fc083758399a9f35e179e2f2d2c1ea01b2b1 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./sar 1 2 > tests/out.sar.tmp
+LC_ALL=C TZ=GMT ./sar 1 2 > tests/out.sar.tmp && diff -u tests/expected.sar1 tests/out.sar.tmp
diff --git a/tests/00942 b/tests/00942
deleted file mode 100644 (file)
index f256c87..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar.tmp tests/expected.sar1
index 027bd4aadc963bd7bc36d47960c1f575d575e9d3..5478217c3e812a67b14aef0984477744772f7552 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./sar -qu 0 > tests/out.sar-qu.tmp
+LC_ALL=C TZ=GMT ./sar -qu 0 > tests/out.sar-qu.tmp && diff -u tests/expected.sar-qu tests/out.sar-qu.tmp
diff --git a/tests/00952 b/tests/00952
deleted file mode 100644 (file)
index 7db7c83..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-qu.tmp tests/expected.sar-qu
index 36d3c43db54a2d773159d2408585b7ffee9e8211..487183be2a845b60c7e62f26ff6eb6341f951dc5 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./sar -q -u 0 > tests/out1.sar-qu.tmp
+LC_ALL=C TZ=GMT ./sar -q -u 0 > tests/out1.sar-qu.tmp && diff -u tests/expected.sar-qu tests/out1.sar-qu.tmp
diff --git a/tests/00956 b/tests/00956
deleted file mode 100644 (file)
index caa88b7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out1.sar-qu.tmp tests/expected.sar-qu
index fdc4365da881bef1d0b332f5a1e0624d3975bf04..20b9337debfd81d1a045dbcc613a77590a5b5ae0 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./sar -q IO 0 > tests/out.sar-qIO.tmp
+LC_ALL=C TZ=GMT ./sar -q IO 0 > tests/out.sar-qIO.tmp && diff -u tests/expected.sar-qIO tests/out.sar-qIO.tmp
diff --git a/tests/00959 b/tests/00959
deleted file mode 100644 (file)
index 0db3343..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-qIO.tmp tests/expected.sar-qIO
index d16e01115df962c67c90fbe4e745fb14b13caf69..7e93ee5d6ea575f3e4f73f569dbe87012bdfa316 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./sar -q MEM,IO 0 > tests/out.sar-qMEMIO.tmp
+LC_ALL=C TZ=GMT ./sar -q MEM,IO 0 > tests/out.sar-qMEMIO.tmp && diff -u tests/expected.sar-qMEMIO tests/out.sar-qMEMIO.tmp
diff --git a/tests/00962 b/tests/00962
deleted file mode 100644 (file)
index 73504e2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-qMEMIO.tmp tests/expected.sar-qMEMIO
index 21c2a4a5560767dcc0f4e251b9078c249ef391ea..ab9d2699f03e0b05483b48b6357f047b298e1d5a 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./sar -q PSI 0 > tests/out.sar-qPSI.tmp
+LC_ALL=C TZ=GMT ./sar -q PSI 0 > tests/out.sar-qPSI.tmp && diff -u tests/expected.sar-qPSI tests/out.sar-qPSI.tmp
diff --git a/tests/00966 b/tests/00966
deleted file mode 100644 (file)
index a409dd1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-qPSI.tmp tests/expected.sar-qPSI
index 4b6f385d5e22f72b35079afd26e06fdc94a1ef93..b74f5d9f83f993b56c9947bc8bcb4c7a520874cc 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./sar -q ALL 0 > tests/out.sar-qALL.tmp
+LC_ALL=C TZ=GMT ./sar -q ALL 0 > tests/out.sar-qALL.tmp && diff -u tests/expected.sar-qALL tests/out.sar-qALL.tmp
diff --git a/tests/00969 b/tests/00969
deleted file mode 100644 (file)
index f4f04db..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-qALL.tmp tests/expected.sar-qALL
index 50231fc00c1d31a268178bea71443da90e0a360c..34156620263aa12adf3937d76a7d9ceb26f11d0b 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root6 tests/root
-LC_ALL=C TZ=GMT ./sar -q ALL 1 1 > tests/out1.sar-qALL.tmp
+LC_ALL=C TZ=GMT ./sar -q ALL 1 1 > tests/out1.sar-qALL.tmp && diff -u tests/expected1.sar-qALL tests/out1.sar-qALL.tmp
diff --git a/tests/00972 b/tests/00972
deleted file mode 100644 (file)
index d9d15b2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out1.sar-qALL.tmp tests/expected1.sar-qALL
index 4bfec79896c11626857c82f7913979d1ea330771..134b74bf6962e25066442799afb242bd1ba946e5 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -f tests/data1.tmp -q ALL > tests/out2.sar-q.tmp
+LC_ALL=C TZ=GMT ./sar -f tests/data1.tmp -q ALL > tests/out2.sar-q.tmp && diff -u tests/expected2.sar-q tests/out2.sar-q.tmp
diff --git a/tests/00984 b/tests/00984
deleted file mode 100644 (file)
index e2a099f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out2.sar-q.tmp tests/expected2.sar-q
index 5d46c908c01aef894f4f7e22099343b43d9c59a8..bfe681dd15098f75bb3392f659684ab8b2f9e8f6 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -f tests/data1.tmp -q ALL > tests/out2.sar-qALL.tmp
+LC_ALL=C TZ=GMT ./sar -f tests/data1.tmp -q ALL > tests/out2.sar-qALL.tmp && diff -u tests/expected2.sar-qALL tests/out2.sar-qALL.tmp
diff --git a/tests/01014 b/tests/01014
deleted file mode 100644 (file)
index b3d9ddf..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out2.sar-qALL.tmp tests/expected2.sar-qALL
index 3629131037f2cd0f492e75dd1dc7314978b6fc19..1ae778c69d05e14d104a97f8d36a593c0384105f 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -A -f tests/data0.tmp > tests/out0.sar-A.tmp
+LC_ALL=C TZ=GMT ./sar -A -f tests/data0.tmp > tests/out0.sar-A.tmp && diff -u tests/expected0.sar-A tests/out0.sar-A.tmp
diff --git a/tests/01102 b/tests/01102
deleted file mode 100644 (file)
index f0f32e8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out0.sar-A.tmp tests/expected0.sar-A
index 8ce3a07bfeded014be1c1d00d3357c41f918bc3d..e64c6bc3e0771dd7d47674345668eb355ab00512 100644 (file)
@@ -1 +1 @@
-./sadf tests/data0.tmp -- -A > tests/out0.sadf.tmp
+./sadf tests/data0.tmp -- -A > tests/out0.sadf.tmp && diff -u tests/expected0.sadf tests/out0.sadf.tmp
diff --git a/tests/01112 b/tests/01112
deleted file mode 100644 (file)
index 2362d3f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out0.sadf.tmp tests/expected0.sadf
index 98e52682bb4c5b26b3b4efe75e6aeed14817d8ec..74821d20dfaf9247de98cf562415d287e4f3c576 100644 (file)
@@ -1 +1 @@
-./sadf -x tests/data0.tmp -- -A > tests/out0.sadf-x.tmp
+./sadf -x tests/data0.tmp -- -A > tests/out0.sadf-x.tmp && diff -u tests/expected0.sadf-x tests/out0.sadf-x.tmp
diff --git a/tests/01122 b/tests/01122
deleted file mode 100644 (file)
index 9c9c9a6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out0.sadf-x.tmp tests/expected0.sadf-x
index 5c616cb8845d79cb481563fa2c6f472e727ee41a..520898e3e57875e2576d7bd6ff99f285a92f7593 100644 (file)
@@ -1 +1 @@
-LC_ALL=C ./sadf -g tests/data0.tmp -- -A > tests/out0.sadf-g.tmp
+LC_ALL=C ./sadf -g tests/data0.tmp -- -A > tests/out0.sadf-g.tmp && diff -u tests/expected0.sadf-g tests/out0.sadf-g.tmp
diff --git a/tests/01152 b/tests/01152
deleted file mode 100644 (file)
index 658d653..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out0.sadf-g.tmp tests/expected0.sadf-g
index 67aa499441042493e2c36dfee19d07064db49436..b93b1c98504d84bf2b47633d3c08bc035d373db4 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -A -f tests/data0.tmp > tests/out01.sar-A.tmp
+LC_ALL=C TZ=GMT ./sar -A -f tests/data0.tmp > tests/out01.sar-A.tmp && diff -u tests/expected01.sar-A tests/out01.sar-A.tmp
diff --git a/tests/01212 b/tests/01212
deleted file mode 100644 (file)
index 80ebb4c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out01.sar-A.tmp tests/expected01.sar-A
index 5c131ae05ea0f926f36c809903edeccbd46ff1ee..c73006f48ba1e8ad83923455ec85976ac1b7fa8b 100644 (file)
@@ -1 +1 @@
-./sadf -d tests/data0.tmp -- -A > tests/out01.sadf-d.tmp
+./sadf -d tests/data0.tmp -- -A > tests/out01.sadf-d.tmp && diff -u tests/expected01.sadf-d tests/out01.sadf-d.tmp
diff --git a/tests/01222 b/tests/01222
deleted file mode 100644 (file)
index 0710547..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out01.sadf-d.tmp tests/expected01.sadf-d
index 44e53aa8b7f60df7220532d07669622e3020c16e..e4a1ccce711edd0b9fdc37db63e519e2e69e02a8 100644 (file)
@@ -1 +1 @@
-LC_ALL=C ./sadf -g tests/data0.tmp -- -A > tests/out01.sadf-g.tmp
+LC_ALL=C ./sadf -g tests/data0.tmp -- -A > tests/out01.sadf-g.tmp && diff -u tests/expected01.sadf-g tests/out01.sadf-g.tmp
diff --git a/tests/01242 b/tests/01242
deleted file mode 100644 (file)
index c4dc227..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out01.sadf-g.tmp tests/expected01.sadf-g
index 0bd3c5f4e79dec7efaf537aed3580713883455bc..a7302ba225ca06dd7987a34c0ae3c719931ff584 100644 (file)
@@ -1 +1 @@
-LC_ALL=C ./sadf -H tests/data0.tmp > tests/out01.sadf-H.tmp
+LC_ALL=C ./sadf -H tests/data0.tmp > tests/out01.sadf-H.tmp && diff -u tests/expected01.sadf-H tests/out01.sadf-H.tmp
diff --git a/tests/01252 b/tests/01252
deleted file mode 100644 (file)
index e349250..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out01.sadf-H.tmp tests/expected01.sadf-H
index a5ab1c1c28f39e4c902f287707bb791260aa6724..0eaf1763a615086a9644339aa89810b5c3fedf5f 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -f tests/sa01 > tests/out3.sar-u.tmp
+LC_ALL=C TZ=GMT ./sar -f tests/sa01 > tests/out3.sar-u.tmp && diff -u tests/expected3.sar-u tests/out3.sar-u.tmp
diff --git a/tests/01312 b/tests/01312
deleted file mode 100644 (file)
index e37cf4f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out3.sar-u.tmp tests/expected3.sar-u
index 852a0c8b5acb31d0705710b8acfcf460f419d760..96c55f97a924dd2f7144f48f35c35d3b6eb41e5b 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar > tests/out31.sar-u.tmp
+LC_ALL=C TZ=GMT ./sar > tests/out31.sar-u.tmp && diff -u tests/expected3.sar-u tests/out31.sar-u.tmp
diff --git a/tests/01316 b/tests/01316
deleted file mode 100644 (file)
index 518ef8d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out31.sar-u.tmp tests/expected3.sar-u
index 3c9477d0c0c7ccaabe5fe497d4c897401257c502..c2b3e43558d66d7f5635f5073c4b05b1bd575697 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -f tests > tests/out34.sar-u.tmp
+LC_ALL=C TZ=GMT ./sar -f tests > tests/out34.sar-u.tmp && diff -u tests/expected3.sar-u tests/out34.sar-u.tmp
diff --git a/tests/01319 b/tests/01319
deleted file mode 100644 (file)
index 5d8ae75..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out34.sar-u.tmp tests/expected3.sar-u
index b7fbf66fad3303ae34fa012bbb975fb6fb00e91a..eecc65c1fbe841b40fa2e40c9a95ae61afc82b80 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -f tests/sa19700101 > tests/out32.sar-u.tmp
+LC_ALL=C TZ=GMT ./sar -f tests/sa19700101 > tests/out32.sar-u.tmp && diff -u tests/expected32.sar-u tests/out32.sar-u.tmp
diff --git a/tests/01332 b/tests/01332
deleted file mode 100644 (file)
index 9f4cf4c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out32.sar-u.tmp tests/expected32.sar-u
index 33c8268d845758b1e505340dbf5f1e4a414f0c14..d5073f4c747e39723623ba0fa426f230d0e47e94 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar > tests/out33.sar-u.tmp
+LC_ALL=C TZ=GMT ./sar > tests/out33.sar-u.tmp && diff -u tests/expected32.sar-u tests/out33.sar-u.tmp
diff --git a/tests/01337 b/tests/01337
deleted file mode 100644 (file)
index edfe6b1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out33.sar-u.tmp tests/expected32.sar-u
index 76fa046af209363a0be9c15c7d50186cf1267d91..4ce0588b0562713340e97c7b38b96d82a9edcdc7 100644 (file)
@@ -1 +1 @@
-./sadf > tests/out3.sadf.tmp
+./sadf > tests/out3.sadf.tmp && diff -u tests/expected3.sadf tests/out3.sadf.tmp
diff --git a/tests/01342 b/tests/01342
deleted file mode 100644 (file)
index 12d86a2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out3.sadf.tmp tests/expected3.sadf
index 66dad3ac5f0d7ea2d4975a71e1e581c231471646..b3d1b3a6988fa1e51259b1e3ea3fe2f8aa03bec9 100644 (file)
@@ -1,2 +1,2 @@
 LC_ALL=C TZ=GMT ./sar -f tests/sa01 > tests/out33.sar-u.tmp
-LC_ALL=C TZ=GMT ./sar -f tests/sa02 >> tests/out33.sar-u.tmp
+# Contents of out33.sar-u.tmp checked in next test
index 71ecf3432614aafadff4835b96c32a9fa2188a4d..8a554d96a50fd303cf8d5ad4acc3bf1398797a43 100644 (file)
@@ -1 +1 @@
-diff -u tests/out33.sar-u.tmp tests/expected33.sar-u
+LC_ALL=C TZ=GMT ./sar -f tests/sa02 >> tests/out33.sar-u.tmp && diff -u tests/expected33.sar-u tests/out33.sar-u.tmp
index e6101c6db3b2356eec173ece9e3db740ef5e659c..2ae3f471244e97eeda98ecfe3044b35bc7e10c25 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar --unix_time=1556755203 -1 > tests/out.sar-1.tmp
+LC_ALL=C TZ=GMT ./sar --unix_time=1556755203 -1 > tests/out.sar-1.tmp && diff -u tests/expected.sar-1 tests/out.sar-1.tmp
diff --git a/tests/01362 b/tests/01362
deleted file mode 100644 (file)
index de4dc8a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-1.tmp tests/expected.sar-1
index f95c9a1b756972e72628a75eeb6da0d3090969a1..1f6c8607518609b53b4e067696b647f94500cdd2 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -f tests/sa20190502 > tests/out.sar-D.tmp
+LC_ALL=C TZ=GMT ./sar -f tests/sa20190502 > tests/out.sar-D.tmp && diff -u tests/expected.sar-D tests/out.sar-D.tmp
diff --git a/tests/01375 b/tests/01375
deleted file mode 100644 (file)
index 320d3c0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-D.tmp tests/expected.sar-D
index f5ce0edcbc09ce38958ac24bfae380f80f0fc4c7..b11e29d2900fd83d04332ac25027d860d1836d8a 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -f tests/sa-sigint.tmp -m CPU > tests/out.sar-sigint.tmp
+LC_ALL=C TZ=GMT ./sar -f tests/sa-sigint.tmp -m CPU > tests/out.sar-sigint.tmp && diff -u tests/expected.sar-sigint tests/out.sar-sigint.tmp
diff --git a/tests/01385 b/tests/01385
deleted file mode 100644 (file)
index fea0c2a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-sigint.tmp tests/expected.sar-sigint
index a05a5348bddbcceda47f82cd8736a2984844b196..9b040ea5fa76b3dde95661027bba668a8c50502d 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sadf -g tests/data-trunc -- -A > tests/out.sadf-g-trunc.tmp 2>/dev/null
+LC_ALL=C TZ=GMT ./sadf -g tests/data-trunc -- -A > tests/out.sadf-g-trunc.tmp 2>/dev/null && diff -u tests/expected.sadf-g-trunc tests/out.sadf-g-trunc.tmp
diff --git a/tests/01406 b/tests/01406
deleted file mode 100644 (file)
index e67a996..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sadf-g-trunc.tmp tests/expected.sadf-g-trunc
index 1f036894fe22d1a0f836e11746e45ee89ad7d18a..ddfb7e999a10465e28e7965fb0a5650a600d1b5f 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sadf -d tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-d.tmp
+LC_ALL=C TZ=GMT ./sadf -d tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-d.tmp && diff -u tests/expected.data-11.6.5-sadf-d tests/out.data-11.6.5-sadf-d.tmp
diff --git a/tests/01505 b/tests/01505
deleted file mode 100644 (file)
index cd91b6c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.data-11.6.5-sadf-d.tmp tests/expected.data-11.6.5-sadf-d
index 193451ccda199055bbc690388d23201bc42c7e09..bce304df4ca662589732fe1baf99985c715fa26b 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sadf -p tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-p.tmp
+LC_ALL=C TZ=GMT ./sadf -p tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-p.tmp && diff -u tests/expected.data-11.6.5-sadf-p tests/out.data-11.6.5-sadf-p.tmp
diff --git a/tests/01515 b/tests/01515
deleted file mode 100644 (file)
index e2c73b2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.data-11.6.5-sadf-p.tmp tests/expected.data-11.6.5-sadf-p
index 38894c60134c97df95806756a2afdcec3d6a01bd..9732acf63fc83018fa9dd6b91ed9d291302f3494 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sadf -r tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-r.tmp
+LC_ALL=C TZ=GMT ./sadf -r tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-r.tmp && diff -u tests/expected.data-11.6.5-sadf-r tests/out.data-11.6.5-sadf-r.tmp
diff --git a/tests/01525 b/tests/01525
deleted file mode 100644 (file)
index 48ef2d7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.data-11.6.5-sadf-r.tmp tests/expected.data-11.6.5-sadf-r
index 7a2c686c4cde1dbf1f07f9e6e410bb264f560dc0..3bd33ab8746f9fd7b7e56b8ba8fd8c50f3382864 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sadf -g tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-g.tmp
+LC_ALL=C TZ=GMT ./sadf -g tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-g.tmp && diff -u tests/expected.data-11.6.5-sadf-g tests/out.data-11.6.5-sadf-g.tmp
diff --git a/tests/01535 b/tests/01535
deleted file mode 100644 (file)
index 6abafc2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.data-11.6.5-sadf-g.tmp tests/expected.data-11.6.5-sadf-g
index b6d7d77c9c0deba33a337344c834e941cdb75960..c302afa8b55bc47e22f781f6de32ce0314cb9bde 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sadf -j tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-j.tmp
+LC_ALL=C TZ=GMT ./sadf -j tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-j.tmp && diff -u tests/expected.data-11.6.5-sadf-j tests/out.data-11.6.5-sadf-j.tmp
diff --git a/tests/01545 b/tests/01545
deleted file mode 100644 (file)
index 10f026d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.data-11.6.5-sadf-j.tmp tests/expected.data-11.6.5-sadf-j
index 771b2d870d6b7e13a719d23aa80bf8a12790fc72..b8fee0590a4adc6e23a19881a38b733b6af859dd 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sadf -x tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-x.tmp
+LC_ALL=C TZ=GMT ./sadf -x tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-x.tmp && diff -u tests/expected.data-11.6.5-sadf-x tests/out.data-11.6.5-sadf-x.tmp
diff --git a/tests/01555 b/tests/01555
deleted file mode 100644 (file)
index 2442fad..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.data-11.6.5-sadf-x.tmp tests/expected.data-11.6.5-sadf-x
index df9283dd2c281fc1910ce31f0f4cb53c4b6182bc..af4ff6d2c2fd345f42224e67620e248ce004a130 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sar -f tests/data-wghfreq.tmp -m FREQ -P ALL > tests/out.sar-m-freq.tmp
+LC_ALL=C TZ=GMT ./sar -f tests/data-wghfreq.tmp -m FREQ -P ALL > tests/out.sar-m-freq.tmp && diff -u tests/expected.sar-m-freq tests/out.sar-m-freq.tmp
diff --git a/tests/01615 b/tests/01615
deleted file mode 100644 (file)
index 1e1bd90..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-m-freq.tmp tests/expected.sar-m-freq
index 17153a32a121a55f42ecd39dbaa5a749e133af95..a8a0b21aa9f87134dd081c72b3d9009beda91572 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sadf -d tests/data-wghfreq.tmp -- -m FREQ -P ALL > tests/out.data-wghfreq-sadf-d.tmp
+LC_ALL=C TZ=GMT ./sadf -d tests/data-wghfreq.tmp -- -m FREQ -P ALL > tests/out.data-wghfreq-sadf-d.tmp && diff -u tests/expected.data-wghfreq-sadf-d tests/out.data-wghfreq-sadf-d.tmp
diff --git a/tests/01625 b/tests/01625
deleted file mode 100644 (file)
index 7c17b85..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.data-wghfreq-sadf-d.tmp tests/expected.data-wghfreq-sadf-d
index b5b62517e785f1154a52d566cf44e13e9dba6189..9badc2589dd59da6db57eda88c9831b5fad87f38 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sadf -p tests/data-wghfreq.tmp -- -m FREQ -P ALL > tests/out.data-wghfreq-sadf-p.tmp
+LC_ALL=C TZ=GMT ./sadf -p tests/data-wghfreq.tmp -- -m FREQ -P ALL > tests/out.data-wghfreq-sadf-p.tmp && diff -u tests/expected.data-wghfreq-sadf-p tests/out.data-wghfreq-sadf-p.tmp
diff --git a/tests/01635 b/tests/01635
deleted file mode 100644 (file)
index 3545fa0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.data-wghfreq-sadf-p.tmp tests/expected.data-wghfreq-sadf-p
index 09e903712f91b7199b7a1ee377dbda795b568128..91035463b39db75277cda6de534fa67f62068e24 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sadf -r tests/data-wghfreq.tmp -- -m FREQ -P ALL > tests/out.data-wghfreq-sadf-r.tmp
+LC_ALL=C TZ=GMT ./sadf -r tests/data-wghfreq.tmp -- -m FREQ -P ALL > tests/out.data-wghfreq-sadf-r.tmp && diff -u tests/expected.data-wghfreq-sadf-r tests/out.data-wghfreq-sadf-r.tmp
diff --git a/tests/01645 b/tests/01645
deleted file mode 100644 (file)
index b9824e5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.data-wghfreq-sadf-r.tmp tests/expected.data-wghfreq-sadf-r
index aef26b88e9995f41df9f237f96d1053381aa96f2..09e5bdf509bc0612cf26141076c101936875028d 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sadf -j tests/data-wghfreq.tmp -- -m FREQ -P ALL > tests/out.data-wghfreq-sadf-j.tmp
+LC_ALL=C TZ=GMT ./sadf -j tests/data-wghfreq.tmp -- -m FREQ -P ALL > tests/out.data-wghfreq-sadf-j.tmp && diff -u tests/expected.data-wghfreq-sadf-j tests/out.data-wghfreq-sadf-j.tmp
diff --git a/tests/01655 b/tests/01655
deleted file mode 100644 (file)
index 78e3011..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.data-wghfreq-sadf-j.tmp tests/expected.data-wghfreq-sadf-j
index 9fa2bd169e600b98dbd14510ef1261f2bf8bf030..c71662730cc813ed00db7d27e66525d49dfd1b42 100644 (file)
@@ -1 +1 @@
-LC_ALL=C TZ=GMT ./sadf -x tests/data-wghfreq.tmp -- -m FREQ -P ALL > tests/out.data-wghfreq-sadf-x.tmp
+LC_ALL=C TZ=GMT ./sadf -x tests/data-wghfreq.tmp -- -m FREQ -P ALL > tests/out.data-wghfreq-sadf-x.tmp && diff -u tests/expected.data-wghfreq-sadf-x tests/out.data-wghfreq-sadf-x.tmp
diff --git a/tests/01665 b/tests/01665
deleted file mode 100644 (file)
index d27f83c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.data-wghfreq-sadf-x.tmp tests/expected.data-wghfreq-sadf-x
index 27e92c2e24aace41dfa76dab9c9d285d8598119f..99511113fad3c00c749d9795bd24fccd6c14f53f 100644 (file)
@@ -1,5 +1,3 @@
 rm -f tests/root
 ln -s root3 tests/root
-LC_ALL=C TZ=GMT ./sar -P ALL -u -n SOFT 2 3 > tests/out.sar-cpu6off.tmp
-rm -f tests/root
-ln -s root1 tests/root
+LC_ALL=C TZ=GMT ./sar -P ALL -u -n SOFT 2 3 > tests/out.sar-cpu6off.tmp && diff -u tests/expected.sar-cpu6off tests/out.sar-cpu6off.tmp
diff --git a/tests/01705 b/tests/01705
deleted file mode 100644 (file)
index 34f37d2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-cpu6off.tmp tests/expected.sar-cpu6off
index 87cbab69dbfab0ba9bed23b6569614b0cb3f790f..189ce687c7fcb6fe91739ab664a8e774a7a7a87c 100644 (file)
@@ -1,5 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./sar -P ALL -u -n SOFT 2 3 > tests/out.sar-cpu8onoff.tmp
-rm -f tests/root
-ln -s root1 tests/root
+LC_ALL=C TZ=GMT ./sar -P ALL -u -n SOFT 2 3 > tests/out.sar-cpu8onoff.tmp && diff -u tests/expected.sar-cpu8onoff tests/out.sar-cpu8onoff.tmp
diff --git a/tests/01715 b/tests/01715
deleted file mode 100644 (file)
index c78a7de..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-cpu8onoff.tmp tests/expected.sar-cpu8onoff
index 0916e500d2becad7e4d81022cd7f1f4e220310f1..7a16c26ca3d23c722aa1bdac9ee8c1ceb342949b 100644 (file)
@@ -1,5 +1,3 @@
 rm -f tests/root
 ln -s root2 tests/root
-LC_ALL=C TZ=GMT ./sar -P ALL -u -n SOFT 2 3 > tests/out.sar-cpu8off.tmp
-rm -f tests/root
-ln -s root1 tests/root
+LC_ALL=C TZ=GMT ./sar -P ALL -u -n SOFT 2 3 > tests/out.sar-cpu8off.tmp && diff -u tests/expected.sar-cpu8off tests/out.sar-cpu8off.tmp && rm -f tests/root && ln -s root1 tests/root
diff --git a/tests/01725 b/tests/01725
deleted file mode 100644 (file)
index e544924..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.sar-cpu8off.tmp tests/expected.sar-cpu8off
index d03c18f3c343e615e0f8ffd10ea94f21090858f0..de7dbd49b0b583f55c7ded3ae0b6ca670d507fdd 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat 2 3 > tests/out.iostat.tmp
+LC_ALL=C TZ=GMT ./iostat 2 3 > tests/out.iostat.tmp && diff -u tests/expected.iostat tests/out.iostat.tmp
diff --git a/tests/02015 b/tests/02015
deleted file mode 100644 (file)
index ef0217b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat.tmp tests/expected.iostat
index 5fe406fc79d1b540fff45a5f8cabe6d2c04f6df5..11ec86a719af1b6f6a8724073f92490d058a4ac9 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat ALL 2 3 > tests/out.iostat-ALL.tmp
+LC_ALL=C TZ=GMT ./iostat ALL 2 3 > tests/out.iostat-ALL.tmp && diff -u tests/expected.iostat-ALL tests/out.iostat-ALL.tmp
diff --git a/tests/02025 b/tests/02025
deleted file mode 100644 (file)
index 8bc24c5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-ALL.tmp tests/expected.iostat-ALL
index bdc6f05e9dd5781d7b3deffbfd2799f89c530a1b..a84aef94fde6a4efe9f067bb38e7daef91a4d81b 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -d -p ALL 2 3 > tests/out.iostat-p-ALL.tmp
+LC_ALL=C TZ=GMT ./iostat -d -p ALL 2 3 > tests/out.iostat-p-ALL.tmp && diff -u tests/expected.iostat-p-ALL tests/out.iostat-p-ALL.tmp
diff --git a/tests/02035 b/tests/02035
deleted file mode 100644 (file)
index 12077b9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-p-ALL.tmp tests/expected.iostat-p-ALL
index faa1c5a275f0cf734750e06dc4248151bc21e97c..8a54e8c18c3db4acd52a22c739a879d95ea091b7 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -p sda 2 3 > tests/out.iostat-p-sda.tmp
+LC_ALL=C TZ=GMT ./iostat -p sda 2 3 > tests/out.iostat-p-sda.tmp && diff -u tests/expected.iostat-p-sda tests/out.iostat-p-sda.tmp
diff --git a/tests/02045 b/tests/02045
deleted file mode 100644 (file)
index fa66a75..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-p-sda.tmp tests/expected.iostat-p-sda
index 4182e4d6428b93b81c194cfae1da10de1ac6b2d5..6cb0dd5ac5673f7c46355673c4d3d63c00051f02 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -d ALL -p ALL 2 3 > tests/out.iostat-ALL-p-ALL.tmp
+LC_ALL=C TZ=GMT ./iostat -d ALL -p ALL 2 3 > tests/out.iostat-ALL-p-ALL.tmp && diff -u tests/expected.iostat-ALL-p-ALL tests/out.iostat-ALL-p-ALL.tmp
diff --git a/tests/02055 b/tests/02055
deleted file mode 100644 (file)
index 85617e0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-ALL-p-ALL.tmp tests/expected.iostat-ALL-p-ALL
index af1c4eb83f786839de261635f8591d805e1bc804..1bc0e45ce01d9acd2e434853ac82dda865a026a1 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat > tests/out.iostat-0.tmp
+LC_ALL=C TZ=GMT ./iostat > tests/out.iostat-0.tmp && diff -u tests/expected.iostat-0 tests/out.iostat-0.tmp
diff --git a/tests/02065 b/tests/02065
deleted file mode 100644 (file)
index bf83a5d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-0.tmp tests/expected.iostat-0
index fd281f3b2d3bd40766090bfcbf615b7e4143bbb9..32bdc18addc09fdb6e9e2e4b8086dbf9f0602b02 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat sda sdc 2 3 > tests/out.iostat-list.tmp
+LC_ALL=C TZ=GMT ./iostat sda sdc 2 3 > tests/out.iostat-list.tmp && diff -u tests/expected.iostat-list tests/out.iostat-list.tmp
diff --git a/tests/02075 b/tests/02075
deleted file mode 100644 (file)
index 91d7510..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-list.tmp tests/expected.iostat-list
index 7d054bd70628623ce80c96bdb67ca392690f7548..2073d20e3a259e5be7f869f8e0a3bd03150f5fb0 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat --pretty -d ALL -p ALL 2 2 > tests/out.iostat-pretty.tmp
+LC_ALL=C TZ=GMT ./iostat --pretty -d ALL -p ALL 2 2 > tests/out.iostat-pretty.tmp && diff -u tests/expected.iostat-pretty tests/out.iostat-pretty.tmp
diff --git a/tests/02085 b/tests/02085
deleted file mode 100644 (file)
index 296604e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-pretty.tmp tests/expected.iostat-pretty
index 44a1bb307ceb2f2f83907a6c417d7c17a7675e05..ba5251c5e1889a495aa2b89368e362dc05cfd0d4 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -x 1 2 > tests/out.iostat-x.tmp
+LC_ALL=C TZ=GMT ./iostat -x 1 2 > tests/out.iostat-x.tmp && diff -u tests/expected.iostat-x tests/out.iostat-x.tmp
diff --git a/tests/02115 b/tests/02115
deleted file mode 100644 (file)
index a7bf2b2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-x.tmp tests/expected.iostat-x
index 5c05ff45b61f19572b789332aa0bd2a1f06c9012..337dea1eb0aee358378826ffca5bc211dd2e5d59 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -x ALL 1 2 > tests/out.iostat-x-ALL.tmp
+LC_ALL=C TZ=GMT ./iostat -x ALL 1 2 > tests/out.iostat-x-ALL.tmp && diff -u tests/expected.iostat-x-ALL tests/out.iostat-x-ALL.tmp
diff --git a/tests/02125 b/tests/02125
deleted file mode 100644 (file)
index eef6f7e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-x-ALL.tmp tests/expected.iostat-x-ALL
index 3e097513c29c05c23ce1d5651ef129a53adbe04e..af5ad9521fb311e347f340a55aedc78fdf6b17ae 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -x -p ALL 1 2 > tests/out.iostat-x-p-ALL.tmp
+LC_ALL=C TZ=GMT ./iostat -x -p ALL 1 2 > tests/out.iostat-x-p-ALL.tmp && diff -u tests/expected.iostat-x-p-ALL tests/out.iostat-x-p-ALL.tmp
diff --git a/tests/02135 b/tests/02135
deleted file mode 100644 (file)
index 76fd98e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-x-p-ALL.tmp tests/expected.iostat-x-p-ALL
index 34cb3ceb2f3ff41f16c0702574e44bbb59985893..5c97540b69e2e14ed5c55468da573b392f981ef3 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -x -p sda 1 2 > tests/out.iostat-x-p-sda.tmp
+LC_ALL=C TZ=GMT ./iostat -x -p sda 1 2 > tests/out.iostat-x-p-sda.tmp && diff -u tests/expected.iostat-x-p-sda tests/out.iostat-x-p-sda.tmp
diff --git a/tests/02145 b/tests/02145
deleted file mode 100644 (file)
index fbee8d0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-x-p-sda.tmp tests/expected.iostat-x-p-sda
index 790bd2ae5e91f374f15c908aa285f48a67c87314..2dcc786c7bd1e2caac067f04893f97e491456e0e 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -dx ALL -p ALL 1 7 > tests/out.iostat-x-ALL-p-ALL.tmp
+LC_ALL=C TZ=GMT ./iostat -dx ALL -p ALL 1 7 > tests/out.iostat-x-ALL-p-ALL.tmp && diff -u tests/expected.iostat-x-ALL-p-ALL tests/out.iostat-x-ALL-p-ALL.tmp
diff --git a/tests/02155 b/tests/02155
deleted file mode 100644 (file)
index 043e2b8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-x-ALL-p-ALL.tmp tests/expected.iostat-x-ALL-p-ALL
index b82cc585b0d7c2ffdb7fabfb34544d1edf0f6d7f..42623006597a44fce97a08ede6af55df4aa2abcf 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -x > tests/out.iostat-x-0.tmp
+LC_ALL=C TZ=GMT ./iostat -x > tests/out.iostat-x-0.tmp && diff -u tests/expected.iostat-x-0 tests/out.iostat-x-0.tmp
diff --git a/tests/02165 b/tests/02165
deleted file mode 100644 (file)
index 771f95f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-x-0.tmp tests/expected.iostat-x-0
index 897ead51b0e6824f125b53ce110e0676126e2e9d..541dd2106cc027e2d4ddd21bee8cc14d079e90ed 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -dx -p sdb,sdc > tests/out.iostat-x-list.tmp
+LC_ALL=C TZ=GMT ./iostat -dx -p sdb,sdc > tests/out.iostat-x-list.tmp && diff -u tests/expected.iostat-x-list tests/out.iostat-x-list.tmp
diff --git a/tests/02175 b/tests/02175
deleted file mode 100644 (file)
index 7acc0f1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-x-list.tmp tests/expected.iostat-x-list
index 5496bb29e50e449cf6c4d9cf9633488f6ac49c23..f14180d2d774ee1638ce0cc4590d735692d41fa3 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root3 tests/root
-LC_ALL=C TZ=GMT ./iostat -x ALL 1 3 > tests/out.iostat-x-ALL-flush.tmp
+LC_ALL=C TZ=GMT ./iostat -x ALL 1 3 > tests/out.iostat-x-ALL-flush.tmp && diff -u tests/expected.iostat-x-ALL-flush tests/out.iostat-x-ALL-flush.tmp
diff --git a/tests/02185 b/tests/02185
deleted file mode 100644 (file)
index 096accd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-x-ALL-flush.tmp tests/expected.iostat-x-ALL-flush
index 4f273925a918b0c86b0d3ccd46e5cb4dc11d0700..61003458cacf74f835aae80f42e075d572de4390 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -s 1 2 > tests/out.iostat-s.tmp
+LC_ALL=C TZ=GMT ./iostat -s 1 2 > tests/out.iostat-s.tmp && diff -u tests/expected.iostat-s tests/out.iostat-s.tmp
diff --git a/tests/02215 b/tests/02215
deleted file mode 100644 (file)
index 5c5dbd5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-s.tmp tests/expected.iostat-s
index 15d205bd94db2461a07766b2df9fb4d6710400c1..cf3c2f01a36e057a0d648f340b672a9bfd8489aa 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -ds ALL 1 2 > tests/out.iostat-s-ALL.tmp
+LC_ALL=C TZ=GMT ./iostat -ds ALL 1 2 > tests/out.iostat-s-ALL.tmp && diff -u tests/expected.iostat-s-ALL tests/out.iostat-s-ALL.tmp
diff --git a/tests/02225 b/tests/02225
deleted file mode 100644 (file)
index a586462..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-s-ALL.tmp tests/expected.iostat-s-ALL
index aca0b8b610dacb52e269b1543a16ad2607d694d1..dba76a9cc175ce6ca0241624018e7e480bd42fb7 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -s sdb -p ALL 1 2 > tests/out.iostat-s-list-p.tmp
+LC_ALL=C TZ=GMT ./iostat -s sdb -p ALL 1 2 > tests/out.iostat-s-list-p.tmp && diff -u tests/expected.iostat-s-list-p tests/out.iostat-s-list-p.tmp
diff --git a/tests/02235 b/tests/02235
deleted file mode 100644 (file)
index ef18059..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-s-list-p.tmp tests/expected.iostat-s-list-p
index 8abedd8931882109d3f97b85dec5c616b16c9e22..25727ae86e5a87671092aa036c89832632b5140b 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -s -p > tests/out.iostat-sp-0.tmp
+LC_ALL=C TZ=GMT ./iostat -s -p > tests/out.iostat-sp-0.tmp && diff -u tests/expected.iostat-sp-0 tests/out.iostat-sp-0.tmp
diff --git a/tests/02245 b/tests/02245
deleted file mode 100644 (file)
index a13a92e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-sp-0.tmp tests/expected.iostat-sp-0
index cbf6d23b60b34531b067616e0282bccc50e42e9a..c748d01098b6621157f7c7ef0801d556074d55c6 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -s ALL -p ALL 1 2 > tests/out.iostat-s-ALL-p-ALL.tmp
+LC_ALL=C TZ=GMT ./iostat -s ALL -p ALL 1 2 > tests/out.iostat-s-ALL-p-ALL.tmp && diff -u tests/expected.iostat-s-ALL-p-ALL tests/out.iostat-s-ALL-p-ALL.tmp
diff --git a/tests/02255 b/tests/02255
deleted file mode 100644 (file)
index 9f7022e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-s-ALL-p-ALL.tmp tests/expected.iostat-s-ALL-p-ALL
index 3d3782c6b068ed6b7bd6799ab98953544d121860..98f4e42305ef7d30195d8e91ada6d01441c6c305 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -s > tests/out.iostat-s-0.tmp
+LC_ALL=C TZ=GMT ./iostat -s > tests/out.iostat-s-0.tmp && diff -u tests/expected.iostat-s-0 tests/out.iostat-s-0.tmp
diff --git a/tests/02265 b/tests/02265
deleted file mode 100644 (file)
index 9ae98c3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-s-0.tmp tests/expected.iostat-s-0
index 2b427ec846be5500f0ff8290408048235f70181f..854d72fe7ba8885ba03a2189a40a0ea63315cd7f 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -ds sda -p sdb 1 2 > tests/out.iostat-s-list.tmp
+LC_ALL=C TZ=GMT ./iostat -ds sda -p sdb 1 2 > tests/out.iostat-s-list.tmp && diff -u tests/expected.iostat-s-list tests/out.iostat-s-list.tmp
diff --git a/tests/02275 b/tests/02275
deleted file mode 100644 (file)
index 769a927..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-s-list.tmp tests/expected.iostat-s-list
index 5fc178f9405ab8fdb77d684056e0991e9dab91e8..ef3631cd45c46e2ed9e47a59ed3e8778f1bf8e95 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -xs 2 3 > tests/out.iostat-xs.tmp
+LC_ALL=C TZ=GMT ./iostat -xs 2 3 > tests/out.iostat-xs.tmp && diff -u tests/expected.iostat-xs tests/out.iostat-xs.tmp
diff --git a/tests/02315 b/tests/02315
deleted file mode 100644 (file)
index a868ea3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-xs.tmp tests/expected.iostat-xs
index b56af571f7de629a5e9f3b3bde526966ae5a4cf2..66e5df7c6f97c5ddd37324916017e43a526b3af8 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -dxs /dev/sdb 2 3 > tests/out.iostat-xs-sdb.tmp
+LC_ALL=C TZ=GMT ./iostat -dxs /dev/sdb 2 3 > tests/out.iostat-xs-sdb.tmp && diff -u tests/expected.iostat-xs-sdb tests/out.iostat-xs-sdb.tmp
diff --git a/tests/02325 b/tests/02325
deleted file mode 100644 (file)
index 0457d79..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-xs-sdb.tmp tests/expected.iostat-xs-sdb
index 28fdfb16366a405ed36222df08c84dddda1b3e6e..85715985ee399eb45736929cf43382337d266f5f 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -dxs -p sda 2 3 > tests/out.iostat-xs-p-sda.tmp
+LC_ALL=C TZ=GMT ./iostat -dxs -p sda 2 3 > tests/out.iostat-xs-p-sda.tmp && diff -u tests/expected.iostat-xs-p-sda tests/out.iostat-xs-p-sda.tmp
diff --git a/tests/02345 b/tests/02345
deleted file mode 100644 (file)
index 557a17b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-xs-p-sda.tmp tests/expected.iostat-xs-p-sda
index 45b763c57429da9d75b0b495b4b0b8382e9374b2..b67a10d3cb4eb86ee338ae017d02dd9da90d451e 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -xs sda1 sda3 sdc1 -p sdb,sdd > tests/out.iostat-xs-list.tmp
+LC_ALL=C TZ=GMT ./iostat -xs sda1 sda3 sdc1 -p sdb,sdd > tests/out.iostat-xs-list.tmp && diff -u tests/expected.iostat-xs-list tests/out.iostat-xs-list.tmp
diff --git a/tests/02375 b/tests/02375
deleted file mode 100644 (file)
index 12f7f92..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-xs-list.tmp tests/expected.iostat-xs-list
index 17801ed4cf18f89ea6918adfb87e97f621d32707..cd02fe4373a53db2f9f66c983dc7a30ca5705d42 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -xs sda3 sda1 1 3 > tests/out.iostat-xs-list-part.tmp
+LC_ALL=C TZ=GMT ./iostat -xs sda3 sda1 1 3 > tests/out.iostat-xs-list-part.tmp && diff -u tests/expected.iostat-xs-list-part tests/out.iostat-xs-list-part.tmp
diff --git a/tests/02385 b/tests/02385
deleted file mode 100644 (file)
index 624bc6d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-xs-list-part.tmp tests/expected.iostat-xs-list-part
index fbfcac68fea6d0aecdbe8c253431b84b53729147..6ee6b6103aece19dc586f015c00b0e61050c7170 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat 2 > tests/out.iostat-sigint.tmp
+LC_ALL=C TZ=GMT ./iostat 2 > tests/out.iostat-sigint.tmp && diff -u tests/expected.iostat-sigint tests/out.iostat-sigint.tmp
diff --git a/tests/02415 b/tests/02415
deleted file mode 100644 (file)
index dd5a7df..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-sigint.tmp tests/expected.iostat-sigint
index 6664928c71cf695d450b0d325ce5df6fca014bad..e0341597d4731f0aeff6d3e24994498b43e16937 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -d foo > tests/out.iostat-foo.tmp
+LC_ALL=C TZ=GMT ./iostat -d foo > tests/out.iostat-foo.tmp && diff -u tests/expected.iostat-foo tests/out.iostat-foo.tmp
diff --git a/tests/02425 b/tests/02425
deleted file mode 100644 (file)
index b0d7ced..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-foo.tmp tests/expected.iostat-foo
index 8688a0577e5711b50eb1a02bbd2863d56e730d3a..35bfc2551b8bebe8fc7f81a3e9b1c3baa62144d2 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -ct 1 2 > tests/out.iostat-ct.tmp
+LC_ALL=C TZ=GMT ./iostat -ct 1 2 > tests/out.iostat-ct.tmp && diff -u tests/expected.iostat-ct tests/out.iostat-ct.tmp
diff --git a/tests/02435 b/tests/02435
deleted file mode 100644 (file)
index 47ffeef..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-ct.tmp tests/expected.iostat-ct
index d7652109c452fb0b22cc91f142d06e32c5fc4331..36043bc419b6ed14f65d0b625720ebfd29182012 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -d -g disks sda sdb -g other sdc sdd 1 2 > tests/out.iostat-g.tmp
+LC_ALL=C TZ=GMT ./iostat -d -g disks sda sdb -g other sdc sdd 1 2 > tests/out.iostat-g.tmp && diff -u tests/expected.iostat-g tests/out.iostat-g.tmp
diff --git a/tests/02445 b/tests/02445
deleted file mode 100644 (file)
index 7af7f98..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-g.tmp tests/expected.iostat-g
index f77934cc724230a280749e25820134a7f8f9100c..ad2e0ad8aaec2e26bb9bbf7bbc22f3c4272f17ec 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -dH -g disks sda sdb -g other sdc sdd 1 2 > tests/out.iostat-gH.tmp
+LC_ALL=C TZ=GMT ./iostat -dH -g disks sda sdb -g other sdc sdd 1 2 > tests/out.iostat-gH.tmp && diff -u tests/expected.iostat-gH tests/out.iostat-gH.tmp
diff --git a/tests/02455 b/tests/02455
deleted file mode 100644 (file)
index 6e3f0ff..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-gH.tmp tests/expected.iostat-gH
index c7a389166131fddcc6593c60d38beb6b203cb194..b99644d3471b5fbd455cf989ee20f7e80749e72d 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat --dec=1 1 2 > tests/out.iostat-dec.tmp
+LC_ALL=C TZ=GMT ./iostat --dec=1 1 2 > tests/out.iostat-dec.tmp && diff -u tests/expected.iostat-dec tests/out.iostat-dec.tmp
diff --git a/tests/02465 b/tests/02465
deleted file mode 100644 (file)
index f96a71a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-dec.tmp tests/expected.iostat-dec
index 9d4afc773fd3b3b688c7571d5f5f2e312ec646b9..781419043497b19ea96fb22cfcfb881018056618 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -d -p ALL -j PATH > tests/out.iostat-jPATH.tmp
+LC_ALL=C TZ=GMT ./iostat -d -p ALL -j PATH > tests/out.iostat-jPATH.tmp && diff -u tests/expected.iostat-jPATH tests/out.iostat-jPATH.tmp
diff --git a/tests/02472 b/tests/02472
deleted file mode 100644 (file)
index a8c1d48..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-jPATH.tmp tests/expected.iostat-jPATH
index ebf6791c5f40ed4c64c2d1df25345ad1ad9dcbb4..420257a3a9015e7cd5f44508ee838a1e1c0e5442 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -d -p ALL -j ID > tests/out.iostat-jID.tmp
+LC_ALL=C TZ=GMT ./iostat -d -p ALL -j ID > tests/out.iostat-jID.tmp && diff -u tests/expected.iostat-jID tests/out.iostat-jID.tmp
diff --git a/tests/02476 b/tests/02476
deleted file mode 100644 (file)
index 684a92d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-jID.tmp tests/expected.iostat-jID
index d278b7d67131b6bbde484ecfb4ae017932b7fbd2..17622a9a6de9bf447567b17447361590ff954ccc 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -d -p ALL -j LABEL > tests/out.iostat-jLABEL.tmp
+LC_ALL=C TZ=GMT ./iostat -d -p ALL -j LABEL > tests/out.iostat-jLABEL.tmp && diff -u tests/expected.iostat-jLABEL tests/out.iostat-jLABEL.tmp
diff --git a/tests/02482 b/tests/02482
deleted file mode 100644 (file)
index efde90b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-jLABEL.tmp tests/expected.iostat-jLABEL
index 629151eddd0d03c97f69d15c18a42e9d15a13134..770207366283a7b0a8744bc8247c71d811c4a598 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -d -p ALL -j PARTUUID > tests/out.iostat-jPARTUUID.tmp
+LC_ALL=C TZ=GMT ./iostat -d -p ALL -j PARTUUID > tests/out.iostat-jPARTUUID.tmp && diff -u tests/expected.iostat-jPARTUUID tests/out.iostat-jPARTUUID.tmp
diff --git a/tests/02486 b/tests/02486
deleted file mode 100644 (file)
index b7a9f78..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-jPARTUUID.tmp tests/expected.iostat-jPARTUUID
index 5247da4e607215bb809eff450d86050820eb3467..c6a76ba9205bd296e2b0c5331a7d4131831fb078 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -ym 1 2 > tests/out.iostat-ym.tmp
+LC_ALL=C TZ=GMT ./iostat -ym 1 2 > tests/out.iostat-ym.tmp && diff -u tests/expected.iostat-ym tests/out.iostat-ym.tmp
diff --git a/tests/02605 b/tests/02605
deleted file mode 100644 (file)
index ca8fb78..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-ym.tmp tests/expected.iostat-ym
index 2e238f3833f9bf6c483194120c752dc09d8f9fb5..7196b596425da3076feca38902c3b35db55edaa6 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat --human > tests/out.iostat-human.tmp
+LC_ALL=C TZ=GMT ./iostat --human > tests/out.iostat-human.tmp && diff -u tests/expected.iostat-human tests/out.iostat-human.tmp
diff --git a/tests/02615 b/tests/02615
deleted file mode 100644 (file)
index d2e3cbd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-human.tmp tests/expected.iostat-human
index c2bddc0d8c949fe4f7c82a3674981606e80d0499..53a6c49eab92a0c3f83f57e5c5bb6c5be44d0889 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -dh -p ALL > tests/out.iostat-h.tmp
+LC_ALL=C TZ=GMT ./iostat -dh -p ALL > tests/out.iostat-h.tmp && diff -u tests/expected.iostat-h tests/out.iostat-h.tmp
diff --git a/tests/02625 b/tests/02625
deleted file mode 100644 (file)
index b17f2cd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-h.tmp tests/expected.iostat-h
index 0842557e48b9ffcf020182584549cabd1fa614f9..5bc8e02f67073c342b5ef90db1595b9491076752 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -kz -p ALL 1 2 > tests/out.iostat-kz.tmp
+LC_ALL=C TZ=GMT ./iostat -kz -p ALL 1 2 > tests/out.iostat-kz.tmp && diff -u tests/expected.iostat-kz tests/out.iostat-kz.tmp
diff --git a/tests/02635 b/tests/02635
deleted file mode 100644 (file)
index 3bb25ca..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-kz.tmp tests/expected.iostat-kz
index 22e3a34e0c616fef739a5d222c6d01d7a47d4001..547e8633fd8459a7da833c6b600240c09f053eb6 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -dN -p ALL > tests/out.iostat-N.tmp
+LC_ALL=C TZ=GMT ./iostat -dN -p ALL > tests/out.iostat-N.tmp && diff -u tests/expected.iostat-N tests/out.iostat-N.tmp
diff --git a/tests/02645 b/tests/02645
deleted file mode 100644 (file)
index f8b914c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-N.tmp tests/expected.iostat-N
index 01abc7fd46ee3d2068ca513671227d6cea37bb6e..11df2130e1f3490d26e78fedf52db02abd8b5333 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -d -j LABEL OS SYSTEM 1 2 > tests/out.iostat-jLABEL-list.tmp
+LC_ALL=C TZ=GMT ./iostat -d -j LABEL OS SYSTEM 1 2 > tests/out.iostat-jLABEL-list.tmp && diff -u tests/expected.iostat-jLABEL-list tests/out.iostat-jLABEL-list.tmp
diff --git a/tests/02655 b/tests/02655
deleted file mode 100644 (file)
index 964cd5f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-jLABEL-list.tmp tests/expected.iostat-jLABEL-list
index 6f4059d7ae589fc8f9cb6f847fb742d594ee61d4..b1f8d9b19bf12d2c3b8d5fa1c8a9f740286b8c27 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -dxs -j UUID 2578463f-6947-48c7-8b09-876a4145cfb1 1 2 > tests/out.iostat-jUUID-list.tmp
+LC_ALL=C TZ=GMT ./iostat -dxs -j UUID 2578463f-6947-48c7-8b09-876a4145cfb1 1 2 > tests/out.iostat-jUUID-list.tmp && diff -u tests/expected.iostat-jUUID-list tests/out.iostat-jUUID-list.tmp
diff --git a/tests/02665 b/tests/02665
deleted file mode 100644 (file)
index 1050b96..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-jUUID-list.tmp tests/expected.iostat-jUUID-list
index fa9f4cd6bf64e03e6c0ccc8f50a48dc128ce3423..e26e780b5a20db84a7fbb116e101e2edd6604db8 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -g total sda -g foo 1 2 > tests/out.iostat-g2.tmp
+LC_ALL=C TZ=GMT ./iostat -g total sda -g foo 1 2 > tests/out.iostat-g2.tmp && diff -u tests/expected.iostat-g2 tests/out.iostat-g2.tmp
diff --git a/tests/02675 b/tests/02675
deleted file mode 100644 (file)
index 38af236..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-g2.tmp tests/expected.iostat-g2
index 7dda55dc89593533f0a697dbf7006e099be8325a..061b340ade3906c579f73b3271dcc3c540e4c465 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -g total ALL 1 2 > tests/out.iostat-gALL.tmp
+LC_ALL=C TZ=GMT ./iostat -g total ALL 1 2 > tests/out.iostat-gALL.tmp && diff -u tests/expected.iostat-gALL tests/out.iostat-gALL.tmp
diff --git a/tests/02685 b/tests/02685
deleted file mode 100644 (file)
index 30f14db..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-gALL.tmp tests/expected.iostat-gALL
index 9bdfe05da64a4ee3418543f2c02b518b31375865..b6920d64ba5310439ce2e1a200628ef2540425b3 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -g total -p ALL 1 2 > tests/out.iostat-gpALL.tmp
+LC_ALL=C TZ=GMT ./iostat -g total -p ALL 1 2 > tests/out.iostat-gpALL.tmp && diff -u tests/expected.iostat-gpALL tests/out.iostat-gpALL.tmp
diff --git a/tests/02695 b/tests/02695
deleted file mode 100644 (file)
index caa6db0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-gpALL.tmp tests/expected.iostat-gpALL
index f67a5d02b7132cd7f24f1fd986d1c5e3f3e28dae..fc98b75c3f8807e58fc738ed20ccd4a86a87a6e0 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -g other sda9 sda12 -g total -p ALL 1 2 > tests/out2.iostat-gpALL.tmp
+LC_ALL=C TZ=GMT ./iostat -g other sda9 sda12 -g total -p ALL 1 2 > tests/out2.iostat-gpALL.tmp && diff -u tests/expected2.iostat-gpALL tests/out2.iostat-gpALL.tmp
diff --git a/tests/02697 b/tests/02697
deleted file mode 100644 (file)
index c59641e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out2.iostat-gpALL.tmp tests/expected2.iostat-gpALL
index d3ca6b292c37667c5202b61d479ddc0de3bdc601..ba7f4e2b3ddfe60826f18bc59a43109fe932fea1 100644 (file)
@@ -1,4 +1,4 @@
 rm -f tests/root
 ln -s root1 tests/root
 # -p ALL should not be used before a list of devices
-LC_ALL=C TZ=GMT ./iostat -g total -p ALL -g other sda9 sda12 1 2 > tests/out3.iostat-gpALL.tmp
+LC_ALL=C TZ=GMT ./iostat -g total -p ALL -g other sda9 sda12 1 2 > tests/out3.iostat-gpALL.tmp && diff -u tests/expected3.iostat-gpALL tests/out3.iostat-gpALL.tmp
diff --git a/tests/02699 b/tests/02699
deleted file mode 100644 (file)
index 0d98898..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out3.iostat-gpALL.tmp tests/expected3.iostat-gpALL
index 878d3c1ec26fdb770388c9633f36d92b355b127d..e28567743ceb1ff72317c2fe3d6ed97d72c6d899 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -g total -p sda 1 2 > tests/out.iostat-gp.tmp
+LC_ALL=C TZ=GMT ./iostat -g total -p sda 1 2 > tests/out.iostat-gp.tmp && diff -u tests/expected.iostat-gp tests/out.iostat-gp.tmp
diff --git a/tests/02705 b/tests/02705
deleted file mode 100644 (file)
index 6fb2d5c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-gp.tmp tests/expected.iostat-gp
index 30983855b321a60fa43a4cfe824ef7511d46d0c6..7cfe160dc76f1dcd7bdb84d5788fac060138658f 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -g total -p sda -y 1 3 > tests/out.iostat-gpy.tmp
+LC_ALL=C TZ=GMT ./iostat -g total -p sda -y 1 3 > tests/out.iostat-gpy.tmp && diff -u tests/expected.iostat-gpy tests/out.iostat-gpy.tmp
diff --git a/tests/02715 b/tests/02715
deleted file mode 100644 (file)
index 8646479..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-gpy.tmp tests/expected.iostat-gpy
index d420ac677ccd375bad8262d3e52f48588c3c6ed9..0dc423982e07e9036824a5ed10d1a1f58ac76282 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root6 tests/root
-LC_ALL=C TZ=GMT ./iostat -p cciss/c0d0 1 2 > tests/out.iostat-p-cciss.tmp
+LC_ALL=C TZ=GMT ./iostat -p cciss/c0d0 1 2 > tests/out.iostat-p-cciss.tmp && diff -u tests/expected.iostat-p-cciss tests/out.iostat-p-cciss.tmp
diff --git a/tests/02725 b/tests/02725
deleted file mode 100644 (file)
index c0ff3d1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-p-cciss.tmp tests/expected.iostat-p-cciss
index de01f8828135dd72bf73766338c866cced8fd92b..d256de9e0c6a670401173034e4a7a928b270ba5c 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root6 tests/root
-LC_ALL=C TZ=GMT ./iostat cciss/c0d0p2 1 2 > tests/out.iostat-cciss.tmp
+LC_ALL=C TZ=GMT ./iostat cciss/c0d0p2 1 2 > tests/out.iostat-cciss.tmp && diff -u tests/expected.iostat-cciss tests/out.iostat-cciss.tmp
diff --git a/tests/02735 b/tests/02735
deleted file mode 100644 (file)
index 3851ead..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-cciss.tmp tests/expected.iostat-cciss
index cd0e66167a1902c61bf7cc58c9203b1e3bb9d6fa..b1a75e6e5f40ac3f7a381183253e7ad34894be99 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -o JSON -x -p ALL 1 2 > tests/out.iostat-x-p-ALL-JSON.tmp
+LC_ALL=C TZ=GMT ./iostat -o JSON -x -p ALL 1 2 > tests/out.iostat-x-p-ALL-JSON.tmp && diff -u tests/expected.iostat-x-p-ALL-JSON tests/out.iostat-x-p-ALL-JSON.tmp
diff --git a/tests/02745 b/tests/02745
deleted file mode 100644 (file)
index e315c91..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-x-p-ALL-JSON.tmp tests/expected.iostat-x-p-ALL-JSON
index b5fe78b4e7bcbe36e1de0089772ae59809d2bac3..37c4977d0aebfc9812a0f0fd892295e2ca00b598 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -o JSON -dm -g disks sda sdb -g other sdc sdd 1 2 > tests/out.iostat-g-JSON.tmp
+LC_ALL=C TZ=GMT ./iostat -o JSON -dm -g disks sda sdb -g other sdc sdd 1 2 > tests/out.iostat-g-JSON.tmp && diff -u tests/expected.iostat-g-JSON tests/out.iostat-g-JSON.tmp
diff --git a/tests/02755 b/tests/02755
deleted file mode 100644 (file)
index fe202d6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-g-JSON.tmp tests/expected.iostat-g-JSON
index 4df91ee74529123fc2dc53c156a96ab170c436c0..2526e3584396a3781d63ebcf0080eaa9004e3127 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT S_TIME_FORMAT=ISO S_COLORS=never POSIXLY_CORRECT= ./iostat --getenv -d 2 3 > tests/out.iostat-ev.tmp
+LC_ALL=C TZ=GMT S_TIME_FORMAT=ISO S_COLORS=never POSIXLY_CORRECT= ./iostat --getenv -d 2 3 > tests/out.iostat-ev.tmp && diff -u tests/expected.iostat-ev tests/out.iostat-ev.tmp
diff --git a/tests/02805 b/tests/02805
deleted file mode 100644 (file)
index 9a28baf..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-ev.tmp tests/expected.iostat-ev
index 16940bcd98742598b866c7b4ce8105ef8d3e49d9..05630541b16d7c469e09cc5d10a445446e8678cf 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -p ALL 2 2 > tests/out.iostat-alt-pALL.tmp
+LC_ALL=C TZ=GMT ./iostat -p ALL 2 2 > tests/out.iostat-alt-pALL.tmp && diff -u tests/expected.iostat-alt-pALL tests/out.iostat-alt-pALL.tmp
diff --git a/tests/02902 b/tests/02902
deleted file mode 100644 (file)
index f9289a0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-alt-pALL.tmp tests/expected.iostat-alt-pALL
index 1e32eac1f7b39963b813e1e7270608969d7d0b44..8f6613e83d524eb083f57b48a19048512169a967 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -p ALL -f tests/root/proc 2 2 > tests/out.iostat-f-alt-pALL.tmp
+LC_ALL=C TZ=GMT ./iostat -p ALL -f tests/root/proc 2 2 > tests/out.iostat-f-alt-pALL.tmp && diff -u tests/expected.iostat-f-alt-pALL tests/out.iostat-f-alt-pALL.tmp
diff --git a/tests/02907 b/tests/02907
deleted file mode 100644 (file)
index 0444ec3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-f-alt-pALL.tmp tests/expected.iostat-f-alt-pALL
index 8787fe5a0c82ef30631df40885719cde4ab6d8e1..d2eedff8c46d180b3f97818f9eb1d138c55be66c 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -p ALL +f tests/root/proc 2 2 > tests/out.iostat+f-alt-pALL.tmp
+LC_ALL=C TZ=GMT ./iostat -p ALL +f tests/root/proc 2 2 > tests/out.iostat+f-alt-pALL.tmp && diff -u tests/expected.iostat+f-alt-pALL tests/out.iostat+f-alt-pALL.tmp
diff --git a/tests/02912 b/tests/02912
deleted file mode 100644 (file)
index e2e3840..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat+f-alt-pALL.tmp tests/expected.iostat+f-alt-pALL
index 24ff264294fec679e51e57caac45238f0c055e02..88ca32273efb823d0eb76b6d7cc85854db565130 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -p ALL -f tests/root/my_stats 2 2 > tests/out.iostat-f-alt-pALL-ms.tmp
+LC_ALL=C TZ=GMT ./iostat -p ALL -f tests/root/my_stats 2 2 > tests/out.iostat-f-alt-pALL-ms.tmp && diff -u tests/expected.iostat-f-alt-pALL-ms tests/out.iostat-f-alt-pALL-ms.tmp
diff --git a/tests/02922 b/tests/02922
deleted file mode 100644 (file)
index 90a2dbc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-f-alt-pALL-ms.tmp tests/expected.iostat-f-alt-pALL-ms
index 090205a64dec7336754154e3337e5d40ea112759..c7e517d59d21eaa2ef1e703a0f3d65b18b6537e3 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -p ALL +f tests/root/my_stats 2 2 > tests/out.iostat+f-alt-pALL-ms.tmp
+LC_ALL=C TZ=GMT ./iostat -p ALL +f tests/root/my_stats 2 2 > tests/out.iostat+f-alt-pALL-ms.tmp && diff -u tests/expected.iostat+f-alt-pALL-ms tests/out.iostat+f-alt-pALL-ms.tmp
diff --git a/tests/02927 b/tests/02927
deleted file mode 100644 (file)
index 90a2dbc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-f-alt-pALL-ms.tmp tests/expected.iostat-f-alt-pALL-ms
index 0e8f588df5eba878a05544f988efd24f9dd76a72..98c33bb9b16e963b4479f11829dabd3ecc1fd814 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat ALL -f tests/root/my_stats 2 2 > tests/out.iostat-f-alt-ALL-ms.tmp
+LC_ALL=C TZ=GMT ./iostat ALL -f tests/root/my_stats 2 2 > tests/out.iostat-f-alt-ALL-ms.tmp && diff -u tests/expected.iostat-f-alt-ALL-ms tests/out.iostat-f-alt-ALL-ms.tmp
diff --git a/tests/02932 b/tests/02932
deleted file mode 100644 (file)
index e6bf0de..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-f-alt-ALL-ms.tmp tests/expected.iostat-f-alt-ALL-ms
index 5bba19118ecf972edabab1953f6b3d3af0667cec..2a9473b5f82215f65a04c645f7e0ac6f00900c3b 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat ALL +f tests/root/my_stats 2 2 > tests/out.iostat+f-alt-ALL-ms.tmp
+LC_ALL=C TZ=GMT ./iostat ALL +f tests/root/my_stats 2 2 > tests/out.iostat+f-alt-ALL-ms.tmp && diff -u tests/expected.iostat+f-alt-ALL-ms tests/out.iostat+f-alt-ALL-ms.tmp
diff --git a/tests/02937 b/tests/02937
deleted file mode 100644 (file)
index 25d0e03..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat+f-alt-ALL-ms.tmp tests/expected.iostat+f-alt-ALL-ms
index eeaf6d73176e5ef3208fdba4d830a6dddefc93da..c513f276048ad9c62e47791f4547a87d830f789a 100644 (file)
@@ -1,4 +1,4 @@
 rm -f tests/root
 ln -s root1 tests/root
 # Option -f must be used *before* list of devices
-LC_ALL=C TZ=GMT ./iostat -f tests/root/my_stats dm-2 sdg -p sda > tests/out.iostat-f-alt-list-ms.tmp
+LC_ALL=C TZ=GMT ./iostat -f tests/root/my_stats dm-2 sdg -p sda > tests/out.iostat-f-alt-list-ms.tmp && diff -u tests/expected.iostat-f-alt-list-ms tests/out.iostat-f-alt-list-ms.tmp
diff --git a/tests/02942 b/tests/02942
deleted file mode 100644 (file)
index 25b78b7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat-f-alt-list-ms.tmp tests/expected.iostat-f-alt-list-ms
index 7dfab0cb42e88f68c42210d6318a87590826d4ea..73cd3aa30235b33d1fcbe79f527bd6fd0d372599 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat +f tests/root/my_stats dm-2 sdg -p sda > tests/out.iostat+f-alt-list-ms.tmp
+LC_ALL=C TZ=GMT ./iostat +f tests/root/my_stats dm-2 sdg -p sda > tests/out.iostat+f-alt-list-ms.tmp && diff -u tests/expected.iostat+f-alt-list-ms tests/out.iostat+f-alt-list-ms.tmp
diff --git a/tests/02947 b/tests/02947
deleted file mode 100644 (file)
index 2bdfdbb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.iostat+f-alt-list-ms.tmp tests/expected.iostat+f-alt-list-ms
index 7919bfbc1b5315245860e27de19907aae12e930c..c7d2cf4e84ad4359c014f5d574a03b6c9223d695 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat -f tests/root/my_stats sda1 sda13 sdc > tests/out2.iostat-f-alt-list-ms.tmp
+LC_ALL=C TZ=GMT ./iostat -f tests/root/my_stats sda1 sda13 sdc > tests/out2.iostat-f-alt-list-ms.tmp && diff -u tests/expected2.iostat-f-alt-list-ms tests/out2.iostat-f-alt-list-ms.tmp
diff --git a/tests/02952 b/tests/02952
deleted file mode 100644 (file)
index eaf6858..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out2.iostat-f-alt-list-ms.tmp tests/expected2.iostat-f-alt-list-ms
index b35979bd314a8b9eddbc62d373530dded0fbaa9f..c11c821f6838a10bf4b9111c1e449bb521918aa8 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./iostat +f tests/root/my_stats sda1 sda13 sdc > tests/out2.iostat+f-alt-list-ms.tmp
+LC_ALL=C TZ=GMT ./iostat +f tests/root/my_stats sda1 sda13 sdc > tests/out2.iostat+f-alt-list-ms.tmp && diff -u tests/expected2.iostat+f-alt-list-ms tests/out2.iostat+f-alt-list-ms.tmp
diff --git a/tests/02957 b/tests/02957
deleted file mode 100644 (file)
index e913e62..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out2.iostat+f-alt-list-ms.tmp tests/expected2.iostat+f-alt-list-ms
index 0dd8b9104dc9ecef6c18921fecc155a3787a45e4..a39b8a4d17d427c8b2bf86efd76aa61ce560811d 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./mpstat > tests/out.mpstat.tmp
+LC_ALL=C TZ=GMT ./mpstat > tests/out.mpstat.tmp && diff -u tests/expected.mpstat tests/out.mpstat.tmp
diff --git a/tests/03002 b/tests/03002
deleted file mode 100644 (file)
index 0a4e0e6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.mpstat.tmp tests/expected.mpstat
index 6fe22a6fac9f2be0513512cab32f59aec099e254..62e30bb0a153cb811c260925e225f0fc6c55b7e5 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./mpstat -A 1 2 > tests/out.mpstat-A.tmp
+LC_ALL=C TZ=GMT ./mpstat -A 1 2 > tests/out.mpstat-A.tmp && diff -u tests/expected.mpstat-A tests/out.mpstat-A.tmp
diff --git a/tests/03012 b/tests/03012
deleted file mode 100644 (file)
index a18e506..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.mpstat-A.tmp tests/expected.mpstat-A
index 212cef73818ba93abe605e9a2051423423fd1cce..aaa7bbae75e67c91f86e289743c406100cbf4029 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./mpstat -A -P 0,3-5 -N all 1 1 > tests/out.mpstat-APN.tmp
+LC_ALL=C TZ=GMT ./mpstat -A -P 0,3-5 -N all 1 1 > tests/out.mpstat-APN.tmp && diff -u tests/expected.mpstat-APN tests/out.mpstat-APN.tmp
diff --git a/tests/03022 b/tests/03022
deleted file mode 100644 (file)
index d5a6a2d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.mpstat-APN.tmp tests/expected.mpstat-APN
index 0571f348f4e83e8fe862fd8c3b4cb2545c7f9a72..f385e91845df998d79fe43bd2f0c50602b62f6a8 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./mpstat -P 0,3-5 -N all,1 -I CPU,SCPU,SUM > tests/out.mpstat-I.tmp
+LC_ALL=C TZ=GMT ./mpstat -P 0,3-5 -N all,1 -I CPU,SCPU,SUM > tests/out.mpstat-I.tmp && diff -u tests/expected.mpstat-I tests/out.mpstat-I.tmp
diff --git a/tests/03032 b/tests/03032
deleted file mode 100644 (file)
index 817118b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.mpstat-I.tmp tests/expected.mpstat-I
index cbb78055d8c9a7b22b1cfc3449751874362e81c0..aa28391e76d85358925d80b8683782647d7b114a 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./mpstat -I ALL --dec=1 > tests/out.mpstat-dec.tmp
+LC_ALL=C TZ=GMT ./mpstat -I ALL --dec=1 > tests/out.mpstat-dec.tmp && diff -u tests/expected.mpstat-dec tests/out.mpstat-dec.tmp
diff --git a/tests/03042 b/tests/03042
deleted file mode 100644 (file)
index a46c747..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.mpstat-dec.tmp tests/expected.mpstat-dec
index d435cb16e00d1416df6643d725f72497defc83b4..dce997f82fa49322e537526fc5c0e87d7adba625 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./mpstat -T -P ALL 1 2 > tests/out.mpstat-T.tmp
+LC_ALL=C TZ=GMT ./mpstat -T -P ALL 1 2 > tests/out.mpstat-T.tmp && diff -u tests/expected.mpstat-T tests/out.mpstat-T.tmp
diff --git a/tests/03055 b/tests/03055
deleted file mode 100644 (file)
index 24b6957..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.mpstat-T.tmp tests/expected.mpstat-T
index 8b3ac6c2b5587b756e67487bd1491890b014175e..aac796130deb5bfcfce0c6245597e304288ed8b5 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./mpstat -o JSON -A 1 1 > tests/out.mpstat-A-JSON.tmp
+LC_ALL=C TZ=GMT ./mpstat -o JSON -A 1 1 > tests/out.mpstat-A-JSON.tmp && diff -u tests/expected.mpstat-A-JSON tests/out.mpstat-A-JSON.tmp
diff --git a/tests/03065 b/tests/03065
deleted file mode 100644 (file)
index 55f4d04..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.mpstat-A-JSON.tmp tests/expected.mpstat-A-JSON
index 4684dba0f172fc60cb03cf8ef89ddfbb4f26a717..6d4763fa5a5d5a58562ced60ec82a933cd24b0b7 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./mpstat -o JSON -T -P ALL > tests/out.mpstat-T-JSON.tmp
+LC_ALL=C TZ=GMT ./mpstat -o JSON -T -P ALL > tests/out.mpstat-T-JSON.tmp && diff -u tests/expected.mpstat-T-JSON tests/out.mpstat-T-JSON.tmp
diff --git a/tests/03075 b/tests/03075
deleted file mode 100644 (file)
index 22ccccb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.mpstat-T-JSON.tmp tests/expected.mpstat-T-JSON
index eebee137062c348d8d828133859a0ad8377b91fa..b6cdfe821ae412639f8132b71617434ef6824183 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./tapestat > tests/out.tapestat.tmp
+LC_ALL=C TZ=GMT ./tapestat > tests/out.tapestat.tmp && diff -u tests/expected.tapestat tests/out.tapestat.tmp
diff --git a/tests/04005 b/tests/04005
deleted file mode 100644 (file)
index f8ce214..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.tapestat.tmp tests/expected.tapestat
index 9b8a341aa5387a5466893068e944ae9b83c758fb..ee63738117c763df3b9a95567d175b6bcc9d0a1e 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./tapestat -m 1 2 > tests/out.tapestat-m.tmp
+LC_ALL=C TZ=GMT ./tapestat -m 1 2 > tests/out.tapestat-m.tmp && diff -u tests/expected.tapestat-m tests/out.tapestat-m.tmp
diff --git a/tests/04015 b/tests/04015
deleted file mode 100644 (file)
index 6720393..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.tapestat-m.tmp tests/expected.tapestat-m
index 061e91746597bf49d69dd9eab8a267e1e8dc25d7..d36e0ae42eb17a11e1b6dc8195184f7ccca3d979 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./tapestat --human -y 1 2 > tests/out.tapestat-y.tmp
+LC_ALL=C TZ=GMT ./tapestat --human -y 1 2 > tests/out.tapestat-y.tmp && diff -u tests/expected.tapestat-y tests/out.tapestat-y.tmp
diff --git a/tests/04025 b/tests/04025
deleted file mode 100644 (file)
index 94de941..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.tapestat-y.tmp tests/expected.tapestat-y
index 4271ec15f96f7375d53fc164fc37b31aa758cf51..74c3d23cf69ff58f21fd94092ff76ef2abff78a2 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./tapestat -z 1 2 > tests/out.tapestat-z.tmp
+LC_ALL=C TZ=GMT ./tapestat -z 1 2 > tests/out.tapestat-z.tmp && diff -u tests/expected.tapestat-z tests/out.tapestat-z.tmp
diff --git a/tests/04035 b/tests/04035
deleted file mode 100644 (file)
index 21cddf2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.tapestat-z.tmp tests/expected.tapestat-z
index 10af0d2cb6878cb9fb7742d754aac002ea87860d..7a61e28b3b698c8fc09ee89f33649315fcce0c27 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./tapestat -t 1 2 > tests/out.tapestat-t.tmp
+LC_ALL=C TZ=GMT ./tapestat -t 1 2 > tests/out.tapestat-t.tmp && diff -u tests/expected.tapestat-t tests/out.tapestat-t.tmp
diff --git a/tests/04045 b/tests/04045
deleted file mode 100644 (file)
index 29f0f6a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.tapestat-t.tmp tests/expected.tapestat-t
index f703084f20aa5aa9141d22e7b7e7c9b6ef3e41d6..d51544fb857d13245e8e81b150c87a2f5d85c680 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./cifsiostat > tests/out.cifsiostat.tmp
+LC_ALL=C TZ=GMT ./cifsiostat > tests/out.cifsiostat.tmp && diff -u tests/expected.cifsiostat tests/out.cifsiostat.tmp
diff --git a/tests/04505 b/tests/04505
deleted file mode 100644 (file)
index 78059bd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.cifsiostat.tmp tests/expected.cifsiostat
index ee2f2286870f0fc29b8db87c87e667f42ea106df..9f3c47b9a1b2d7cdfa00c690b10e7ccbad97a45e 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./cifsiostat -k 1 3 > tests/out.cifsiostat-k.tmp
+LC_ALL=C TZ=GMT ./cifsiostat -k 1 3 > tests/out.cifsiostat-k.tmp && diff -u tests/expected.cifsiostat-k tests/out.cifsiostat-k.tmp
diff --git a/tests/04515 b/tests/04515
deleted file mode 100644 (file)
index c7a4897..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.cifsiostat-k.tmp tests/expected.cifsiostat-k
index d971ba443c6172479c0c5d72f40f0d3d2a48a39e..00aacfde544b8b1cfc6d4e5f721ae8e96c9f8d03 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./cifsiostat -t --human 1 3 > tests/out.cifsiostat-t-human.tmp
+LC_ALL=C TZ=GMT ./cifsiostat -t --human 1 3 > tests/out.cifsiostat-t-human.tmp && diff -u tests/expected.cifsiostat-t-human tests/out.cifsiostat-t-human.tmp
diff --git a/tests/04525 b/tests/04525
deleted file mode 100644 (file)
index 92b7e43..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.cifsiostat-t-human.tmp tests/expected.cifsiostat-t-human
index 5c5ddf51ba58f3ea4e982b034a9628e9abc3e7d0..bfd597d13d18dbd6f6ac4e5d2f091e8259d0b1d8 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./cifsiostat -h 2 3 > tests/out.cifsiostat-h.tmp
+LC_ALL=C TZ=GMT ./cifsiostat -h 2 3 > tests/out.cifsiostat-h.tmp && diff -u tests/expected.cifsiostat-h tests/out.cifsiostat-h.tmp
diff --git a/tests/04535 b/tests/04535
deleted file mode 100644 (file)
index 6effd0c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.cifsiostat-h.tmp tests/expected.cifsiostat-h
index e6c1c1f3478a83cac6bbbf5cb3ff22ed61c65387..a642f57a035f605122da7eae48e8caa7fe9534c5 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./cifsiostat --dec=0 1 3 > tests/out.cifsiostat-dec.tmp
+LC_ALL=C TZ=GMT ./cifsiostat --dec=0 1 3 > tests/out.cifsiostat-dec.tmp && diff -u tests/expected.cifsiostat-dec tests/out.cifsiostat-dec.tmp
diff --git a/tests/04545 b/tests/04545
deleted file mode 100644 (file)
index 91b635a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.cifsiostat-dec.tmp tests/expected.cifsiostat-dec
index 0b60ed4c9255749a6561a913831a32869ced7ac7..b3356e6e137f41a7696dbdf9bb56c50ead37ff88 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root4 tests/root
-LC_ALL=C TZ=GMT ./cifsiostat 1 2 > tests/out.cifsiostat-SMB2.tmp
+LC_ALL=C TZ=GMT ./cifsiostat 1 2 > tests/out.cifsiostat-SMB2.tmp && diff -u tests/expected.cifsiostat-SMB2 tests/out.cifsiostat-SMB2.tmp
diff --git a/tests/04555 b/tests/04555
deleted file mode 100644 (file)
index cb3a465..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.cifsiostat-SMB2.tmp tests/expected.cifsiostat-SMB2
index 53d38b5b3acec706034c8a04aef5af78558de00f..c58813a981dcc3934d419154bb31fcdd2636a21c 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./cifsiostat --pretty 2 3 > tests/out.cifsiostat-pretty.tmp
+LC_ALL=C TZ=GMT ./cifsiostat --pretty 2 3 > tests/out.cifsiostat-pretty.tmp && diff -u tests/expected.cifsiostat-pretty tests/out.cifsiostat-pretty.tmp
diff --git a/tests/04565 b/tests/04565
deleted file mode 100644 (file)
index 2e83e50..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.cifsiostat-pretty.tmp tests/expected.cifsiostat-pretty
index 2e7e6c07bebb04cc939d90d54be46bf9805e2baa..fd3e964692a2ecf49f0157b74d4177892d90f730 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat > tests/out.pidstat.tmp
+LC_ALL=C TZ=GMT ./pidstat > tests/out.pidstat.tmp && diff -u tests/expected.pidstat tests/out.pidstat.tmp
diff --git a/tests/05005 b/tests/05005
deleted file mode 100644 (file)
index c0798dc..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat.tmp tests/expected.pidstat
index 1c7bbb579c2fcd1cfa7975e587ef41690dfefe34..6d2f488aac718dd2986c37e378a88b801a597d46 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -dRrsuvw > tests/out.pidstat-A.tmp
+LC_ALL=C TZ=GMT ./pidstat -dRrsuvw > tests/out.pidstat-A.tmp && diff -u tests/expected.pidstat-A tests/out.pidstat-A.tmp
diff --git a/tests/05015 b/tests/05015
deleted file mode 100644 (file)
index 0ccb333..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-A.tmp tests/expected.pidstat-A
index 33dc659eb48ba93dd9deab1fa5989d161c8fd9ac..0c61c78a36970cf3bc1862bb47af2ec0ea77df0f 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -t -dRrsuvw > tests/out.pidstat-At.tmp
+LC_ALL=C TZ=GMT ./pidstat -t -dRrsuvw > tests/out.pidstat-At.tmp && diff -u tests/expected.pidstat-At tests/out.pidstat-At.tmp
diff --git a/tests/05025 b/tests/05025
deleted file mode 100644 (file)
index 3684572..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-At.tmp tests/expected.pidstat-At
index a758e08e47d809b32a8c75fdeeb8674d6a3f3808..550d27182fac1e9659bf25f22c2d57775727f2a0 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -dRrsuvw -p ALL > tests/out.pidstat-A-ALL.tmp
+LC_ALL=C TZ=GMT ./pidstat -dRrsuvw -p ALL > tests/out.pidstat-A-ALL.tmp && diff -u tests/expected.pidstat-A-ALL tests/out.pidstat-A-ALL.tmp
diff --git a/tests/05035 b/tests/05035
deleted file mode 100644 (file)
index d9f6fac..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-A-ALL.tmp tests/expected.pidstat-A-ALL
index f1254851fd5b006f96af69144e4ec1558ad111ab..d81b3325a0fcbbf839fcb104ffd85849b406694d 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -t -dRrsuvw -p ALL > tests/out.pidstat-At-ALL.tmp
+LC_ALL=C TZ=GMT ./pidstat -t -dRrsuvw -p ALL > tests/out.pidstat-At-ALL.tmp && diff -u tests/expected.pidstat-At-ALL tests/out.pidstat-At-ALL.tmp
diff --git a/tests/05045 b/tests/05045
deleted file mode 100644 (file)
index ae04da9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-At-ALL.tmp tests/expected.pidstat-At-ALL
index 96a1ea1156599126968a96ab612de3c71f012821..3f89209fb01706d57e2008bbc2e82b7772d477da 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -T TASK -dRrsuvw > tests/out.pidstat-A-TTASK.tmp
+LC_ALL=C TZ=GMT ./pidstat -T TASK -dRrsuvw > tests/out.pidstat-A-TTASK.tmp && diff -u tests/expected.pidstat-A-TTASK tests/out.pidstat-A-TTASK.tmp
diff --git a/tests/05055 b/tests/05055
deleted file mode 100644 (file)
index c323d9e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-A-TTASK.tmp tests/expected.pidstat-A-TTASK
index 3d1cb0e6b4e4b4058bc379830832f00fd01e0692..499f34e1a1abf2196c08ed494e68d25dc7ac991d 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -T TASK -dRrsuvw 2 6 > tests/out1.pidstat-A-TTASK.tmp
+LC_ALL=C TZ=GMT ./pidstat -T TASK -dRrsuvw 2 6 > tests/out1.pidstat-A-TTASK.tmp && diff -u tests/expected1.pidstat-A-TTASK tests/out1.pidstat-A-TTASK.tmp
diff --git a/tests/05065 b/tests/05065
deleted file mode 100644 (file)
index f362428..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out1.pidstat-A-TTASK.tmp tests/expected1.pidstat-A-TTASK
index ccb8863f10c9456710a227036f420d7ca17e54f5..f6ac09787545ecffcb42d3a1e4998735cb3350ce 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -T TASK -t -dRrsuvw 2 6 > tests/out1.pidstat-At-TTASK.tmp
+LC_ALL=C TZ=GMT ./pidstat -T TASK -t -dRrsuvw 2 6 > tests/out1.pidstat-At-TTASK.tmp && diff -u tests/expected1.pidstat-At-TTASK tests/out1.pidstat-At-TTASK.tmp
diff --git a/tests/05075 b/tests/05075
deleted file mode 100644 (file)
index f79f2d1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out1.pidstat-At-TTASK.tmp tests/expected1.pidstat-At-TTASK
index 91b933402f1fab068155edb2dfc526ca524404fc..ac4af1a189d86192a72e17978432a14a0fd1ee31 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -t -dRrsuvw 2 6 > tests/out1.pidstat-At.tmp
+LC_ALL=C TZ=GMT ./pidstat -t -dRrsuvw 2 6 > tests/out1.pidstat-At.tmp && diff -u tests/expected1.pidstat-At tests/out1.pidstat-At.tmp
diff --git a/tests/05085 b/tests/05085
deleted file mode 100644 (file)
index 04dd960..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out1.pidstat-At.tmp tests/expected1.pidstat-At
index 91d0f0462348c001227b7a0c8529ef330e31d765..6a500540fddd7466e22d8e9c9824268ceacf2b69 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -T TASK -t -dRrsuvw -p ALL 2 6 > tests/out1.pidstat-At-TTASK-ALL.tmp
+LC_ALL=C TZ=GMT ./pidstat -T TASK -t -dRrsuvw -p ALL 2 6 > tests/out1.pidstat-At-TTASK-ALL.tmp && diff -u tests/expected1.pidstat-At-TTASK-ALL tests/out1.pidstat-At-TTASK-ALL.tmp
diff --git a/tests/05095 b/tests/05095
deleted file mode 100644 (file)
index 0938bac..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out1.pidstat-At-TTASK-ALL.tmp tests/expected1.pidstat-At-TTASK-ALL
index 9cba80bf3285a96445972b884924ed56be42dd23..ff8a42f7e8134d58e8d12906206381861c0a82ca 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -T CHILD -dRrsuvw > tests/out.pidstat-A-TCHILD.tmp
+LC_ALL=C TZ=GMT ./pidstat -T CHILD -dRrsuvw > tests/out.pidstat-A-TCHILD.tmp && diff -u tests/expected.pidstat-A-TCHILD tests/out.pidstat-A-TCHILD.tmp
diff --git a/tests/05105 b/tests/05105
deleted file mode 100644 (file)
index fc2b700..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-A-TCHILD.tmp tests/expected.pidstat-A-TCHILD
index d52a5d4859cea41f0b80f69423fe69579e70111b..de3419d3e983e526e934f2bb8fdf34601e1df9c5 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -T CHILD -dRrsuvw 2 6 > tests/out1.pidstat-A-TCHILD.tmp
+LC_ALL=C TZ=GMT ./pidstat -T CHILD -dRrsuvw 2 6 > tests/out1.pidstat-A-TCHILD.tmp && diff -u tests/expected1.pidstat-A-TCHILD tests/out1.pidstat-A-TCHILD.tmp
diff --git a/tests/05115 b/tests/05115
deleted file mode 100644 (file)
index 58d8c83..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out1.pidstat-A-TCHILD.tmp tests/expected1.pidstat-A-TCHILD
index 3b7151e38e83502daeb005a27ebe5bb7a09c5327..c65381b14fa57ca1342094f56ce3fb437c77ba44 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -T CHILD -t -dRrsuvw 2 6 > tests/out1.pidstat-At-TCHILD.tmp
+LC_ALL=C TZ=GMT ./pidstat -T CHILD -t -dRrsuvw 2 6 > tests/out1.pidstat-At-TCHILD.tmp && diff -u tests/expected1.pidstat-At-TCHILD tests/out1.pidstat-At-TCHILD.tmp
diff --git a/tests/05125 b/tests/05125
deleted file mode 100644 (file)
index c939d81..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out1.pidstat-At-TCHILD.tmp tests/expected1.pidstat-At-TCHILD
index df31b233a32c0d6e65795663bea626a6bde7715a..d8be857aee71ff963f04523e0b0001ffe69c6dee 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -T CHILD -t -dRrsuvw -p ALL 2 6 > tests/out1.pidstat-At-TCHILD-ALL.tmp
+LC_ALL=C TZ=GMT ./pidstat -T CHILD -t -dRrsuvw -p ALL 2 6 > tests/out1.pidstat-At-TCHILD-ALL.tmp && diff -u tests/expected1.pidstat-At-TCHILD-ALL tests/out1.pidstat-At-TCHILD-ALL.tmp
diff --git a/tests/05135 b/tests/05135
deleted file mode 100644 (file)
index f566453..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out1.pidstat-At-TCHILD-ALL.tmp tests/expected1.pidstat-At-TCHILD-ALL
index 9d434c79524de12cb97ad46f2fdb09406f0aa7c4..a2ee96012fd7b886ee70c8f6e66ce640d12955fb 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -T ALL -t -dRrsuvw > tests/out.pidstat-At-TALL.tmp
+LC_ALL=C TZ=GMT ./pidstat -T ALL -t -dRrsuvw > tests/out.pidstat-At-TALL.tmp && diff -u tests/expected.pidstat-At-TALL tests/out.pidstat-At-TALL.tmp
diff --git a/tests/05145 b/tests/05145
deleted file mode 100644 (file)
index b04e6f1..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-At-TALL.tmp tests/expected.pidstat-At-TALL
index cde1d853c24be93d95211c3126da46a89f7d7d9d..ae726f1b6b739481b8039ba3f6850daea8460dbc 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -T ALL -t -dRrsuvw -p ALL 2 6 > tests/out1.pidstat-At-TALL-ALL.tmp
+LC_ALL=C TZ=GMT ./pidstat -T ALL -t -dRrsuvw -p ALL 2 6 > tests/out1.pidstat-At-TALL-ALL.tmp && diff -u tests/expected1.pidstat-At-TALL-ALL tests/out1.pidstat-At-TALL-ALL.tmp
diff --git a/tests/05155 b/tests/05155
deleted file mode 100644 (file)
index 56f57fb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out1.pidstat-At-TALL-ALL.tmp tests/expected1.pidstat-At-TALL-ALL
index 9f04669b2e765889017d2a51a7f5adf3ac6ef25d..35a5e89f55659c40007ea563e5ad1963531f8890 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -T TASK -d 1 3 > tests/out1.pidstat-d-TTASK.tmp
+LC_ALL=C TZ=GMT ./pidstat -T TASK -d 1 3 > tests/out1.pidstat-d-TTASK.tmp && diff -u tests/expected1.pidstat-d-TTASK tests/out1.pidstat-d-TTASK.tmp
diff --git a/tests/05165 b/tests/05165
deleted file mode 100644 (file)
index 92138f2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out1.pidstat-d-TTASK.tmp tests/expected1.pidstat-d-TTASK
index 16ad609f0ddcc6c61cda6d478edc5459210fc6b0..7485b7e8480fc1e7eb49e25eb8dba6b7f180dd42 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -T TASK -d -p ALL > tests/out.pidstat-d-TTASK-ALL.tmp
+LC_ALL=C TZ=GMT ./pidstat -T TASK -d -p ALL > tests/out.pidstat-d-TTASK-ALL.tmp && diff -u tests/expected.pidstat-d-TTASK-ALL tests/out.pidstat-d-TTASK-ALL.tmp
diff --git a/tests/05175 b/tests/05175
deleted file mode 100644 (file)
index 228acd4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-d-TTASK-ALL.tmp tests/expected.pidstat-d-TTASK-ALL
index 3eea5a24e555dd3953e63acff1c34723fa1400dc..91d766b9b6e46129a38f8761a5bf00a6c8f4b3ba 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -uRr -p 1234 1 2 > tests/out.pidstat-p-unkwn.tmp
+LC_ALL=C TZ=GMT ./pidstat -uRr -p 1234 1 2 > tests/out.pidstat-p-unkwn.tmp && diff -u tests/expected.pidstat-p-unkwn tests/out.pidstat-p-unkwn.tmp
diff --git a/tests/05185 b/tests/05185
deleted file mode 100644 (file)
index 6ee0fcf..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-p-unkwn.tmp tests/expected.pidstat-p-unkwn
index a1f4ed46ef0a03e4d91cfecbd3c6d388e683c154..e539e04e1c9da26a2d91627ade6261b962e7c52b 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -svw -p 8741,8835 1 2 > tests/out2.pidstat-p-unkwn.tmp
+LC_ALL=C TZ=GMT ./pidstat -svw -p 8741,8835 1 2 > tests/out2.pidstat-p-unkwn.tmp && diff -u tests/expected2.pidstat-p-unkwn tests/out2.pidstat-p-unkwn.tmp
diff --git a/tests/05195 b/tests/05195
deleted file mode 100644 (file)
index 93b855e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out2.pidstat-p-unkwn.tmp tests/expected2.pidstat-p-unkwn
index 473fbfae58e8bf5eaf615179af2ca88e9b8a7abc..0dd508149ff1a232901bbf5d9004db7ffe8d2cf7 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -ds -p 8741,21342 1 3 > tests/out.pidstat-p.tmp
+LC_ALL=C TZ=GMT ./pidstat -ds -p 8741,21342 1 3 > tests/out.pidstat-p.tmp && diff -u tests/expected.pidstat-p tests/out.pidstat-p.tmp
diff --git a/tests/05205 b/tests/05205
deleted file mode 100644 (file)
index cc9e0df..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-p.tmp tests/expected.pidstat-p
index 388172f37251450f5ffa5d7e64de716deeeb050b..fee2b6320adae83dd8dd7ac8fdfedf479ec6513c 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -uws -p ALL 1 3 > tests/out1.pidstat-p.tmp
+LC_ALL=C TZ=GMT ./pidstat -uws -p ALL 1 3 > tests/out1.pidstat-p.tmp && diff -u tests/expected1.pidstat-p tests/out1.pidstat-p.tmp
diff --git a/tests/05215 b/tests/05215
deleted file mode 100644 (file)
index fb85c7a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out1.pidstat-p.tmp tests/expected1.pidstat-p
index 4dff60e2f46dc006d122c5a2c8044c1543256a87..76ce4ad3f0894890bc2cc0af94a5fac5e614c6dd 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -druws 1 3 > tests/out1.pidstat.tmp
+LC_ALL=C TZ=GMT ./pidstat -druws 1 3 > tests/out1.pidstat.tmp && diff -u tests/expected1.pidstat tests/out1.pidstat.tmp
diff --git a/tests/05225 b/tests/05225
deleted file mode 100644 (file)
index b3ab9b4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out1.pidstat.tmp tests/expected1.pidstat
index f5241426994ae38c8aa3601bc476e0d344359e72..0698c49cb8116d8208258487f25bc11ff892d234 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -Rw 2 > tests/out.pidstat-sigint.tmp
+LC_ALL=C TZ=GMT ./pidstat -Rw 2 > tests/out.pidstat-sigint.tmp && diff -u tests/expected.pidstat-sigint tests/out.pidstat-sigint.tmp
diff --git a/tests/05235 b/tests/05235
deleted file mode 100644 (file)
index 96d4139..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-sigint.tmp tests/expected.pidstat-sigint
index a8f5ba89e856a5146850d1826e1a68f05d161125..ffe1c1975fc282f3917e6997141a777a60c19fef 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -C foofox 2 6 > tests/out.pidstat-C.tmp
+LC_ALL=C TZ=GMT ./pidstat -C foofox 2 6 > tests/out.pidstat-C.tmp && diff -u tests/expected.pidstat-C tests/out.pidstat-C.tmp
diff --git a/tests/05245 b/tests/05245
deleted file mode 100644 (file)
index 19928d9..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-C.tmp tests/expected.pidstat-C
index df39079f438ca08129a29bb0258cacd1b74ce16c..328f37338e6205e8de783d851b7fa60a432c929a 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -C fox 2 6 > tests/out1.pidstat-C.tmp
+LC_ALL=C TZ=GMT ./pidstat -C fox 2 6 > tests/out1.pidstat-C.tmp && diff -u tests/expected1.pidstat-C tests/out1.pidstat-C.tmp
diff --git a/tests/05255 b/tests/05255
deleted file mode 100644 (file)
index b9642ac..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out1.pidstat-C.tmp tests/expected1.pidstat-C
index ff9ba2b8b42a12120964aec9427232a98d16eec0..5447ad6c8a520aaee2b0956dfad17d0f9c59ca54 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -C Web 2 6 > tests/out2.pidstat-C.tmp
+LC_ALL=C TZ=GMT ./pidstat -C Web 2 6 > tests/out2.pidstat-C.tmp && diff -u tests/expected2.pidstat-C tests/out2.pidstat-C.tmp
diff --git a/tests/05265 b/tests/05265
deleted file mode 100644 (file)
index 049f770..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out2.pidstat-C.tmp tests/expected2.pidstat-C
index db6108a64bc74e275f90267aa64bc6a2584e373f..db6627b7c5a5fdda0e93cea585a424ff17951e6e 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -t -C Web 2 6 > tests/out3.pidstat-C.tmp
+LC_ALL=C TZ=GMT ./pidstat -t -C Web 2 6 > tests/out3.pidstat-C.tmp && diff -u tests/expected3.pidstat-C tests/out3.pidstat-C.tmp
diff --git a/tests/05275 b/tests/05275
deleted file mode 100644 (file)
index f04f3a8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out3.pidstat-C.tmp tests/expected3.pidstat-C
index a93800366686a6787f5e146505ad03d98e87d954..fd3cf14e3f41e14722592274155157ac7c267e2e 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -t -C "(fox|shell)" 2 6 > tests/out4.pidstat-C.tmp
+LC_ALL=C TZ=GMT ./pidstat -t -C "(fox|shell)" 2 6 > tests/out4.pidstat-C.tmp && diff -u tests/expected4.pidstat-C tests/out4.pidstat-C.tmp
diff --git a/tests/05285 b/tests/05285
deleted file mode 100644 (file)
index 98a5bf4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out4.pidstat-C.tmp tests/expected4.pidstat-C
index e5c02d4816481d6f8ee60f68594c14b546a55fe7..67b121f57217eb38b90be10d8181c831819fa8d6 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -t -G foofox 2 6 > tests/out.pidstat-G.tmp
+LC_ALL=C TZ=GMT ./pidstat -t -G foofox 2 6 > tests/out.pidstat-G.tmp && diff -u tests/expected.pidstat-G tests/out.pidstat-G.tmp
diff --git a/tests/05295 b/tests/05295
deleted file mode 100644 (file)
index 7c789c4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-G.tmp tests/expected.pidstat-G
index fa1408d676a9feee1efe2a6e105df7e19d1b030a..1c4caae996a5e73916b9c1749dc59454bf56e9b9 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -G fox 2 6 > tests/out1.pidstat-G.tmp
+LC_ALL=C TZ=GMT ./pidstat -G fox 2 6 > tests/out1.pidstat-G.tmp && diff -u tests/expected1.pidstat-G tests/out1.pidstat-G.tmp
diff --git a/tests/05305 b/tests/05305
deleted file mode 100644 (file)
index e168fb0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out1.pidstat-G.tmp tests/expected1.pidstat-G
index 3d386d15dfa5d60f1e6919994c1ce856636ef177..1ed8d3ead5acdc52d86283075d067e33f06a6347 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -t -G fox 2 6 > tests/out2.pidstat-G.tmp
+LC_ALL=C TZ=GMT ./pidstat -t -G fox 2 6 > tests/out2.pidstat-G.tmp && diff -u tests/expected2.pidstat-G tests/out2.pidstat-G.tmp
diff --git a/tests/05315 b/tests/05315
deleted file mode 100644 (file)
index 78653e2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out2.pidstat-G.tmp tests/expected2.pidstat-G
index ca4d42d39f69f902614922abe19bb3878180e1ea..922d3c64459666b983e98c9755b043b2f188ffaa 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -G fox -p ALL 2 6 > tests/out3.pidstat-G.tmp
+LC_ALL=C TZ=GMT ./pidstat -G fox -p ALL 2 6 > tests/out3.pidstat-G.tmp && diff -u tests/expected3.pidstat-G tests/out3.pidstat-G.tmp
diff --git a/tests/05325 b/tests/05325
deleted file mode 100644 (file)
index 57bfa4c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out3.pidstat-G.tmp tests/expected3.pidstat-G
index a3f67e0d70d73b97c3f3c49d82e5c11e82f83de3..cf6b95d3809bd3e624fd7892c0ebce66c854318d 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -t -G fox -p ALL 2 6 > tests/out4.pidstat-G.tmp
+LC_ALL=C TZ=GMT ./pidstat -t -G fox -p ALL 2 6 > tests/out4.pidstat-G.tmp && diff -u tests/expected4.pidstat-G tests/out4.pidstat-G.tmp
diff --git a/tests/05335 b/tests/05335
deleted file mode 100644 (file)
index 4c0dda0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out4.pidstat-G.tmp tests/expected4.pidstat-G
index 8153c811fad5b0213d1a8c8bdd19cf86851f6922..a4053a5af463064901fbb5044849688645dd19b9 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -t -G "^s" -p ALL 2 6 > tests/out5.pidstat-C.tmp
+LC_ALL=C TZ=GMT ./pidstat -t -G "^s" -p ALL 2 6 > tests/out5.pidstat-C.tmp && diff -u tests/expected5.pidstat-C tests/out5.pidstat-C.tmp
diff --git a/tests/05345 b/tests/05345
deleted file mode 100644 (file)
index ba5ea68..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out5.pidstat-C.tmp tests/expected5.pidstat-C
index b85cbd802105bb9527936a55fcbc3baab025b734..fbe6545dc5356b1dd0c23e531209f2f083360e89 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -t -G "terminal-$" -p ALL 2 6 > tests/out6.pidstat-C.tmp
+LC_ALL=C TZ=GMT ./pidstat -t -G "terminal-$" -p ALL 2 6 > tests/out6.pidstat-C.tmp && diff -u tests/expected6.pidstat-C tests/out6.pidstat-C.tmp
diff --git a/tests/05347 b/tests/05347
deleted file mode 100644 (file)
index 11dfaea..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out6.pidstat-C.tmp tests/expected6.pidstat-C
index 2003024c27cb7fdaeaae55eb202e2149e5759cb0..e96dbfe02252b5872906dc5c0cdb237a1fa1ada5 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -lt -u -p ALL 2 6 > tests/out.pidstat-l.tmp
+LC_ALL=C TZ=GMT ./pidstat -lt -u -p ALL 2 6 > tests/out.pidstat-l.tmp && diff -u tests/expected.pidstat-l tests/out.pidstat-l.tmp
diff --git a/tests/05355 b/tests/05355
deleted file mode 100644 (file)
index 2bced02..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-l.tmp tests/expected.pidstat-l
index 8ca97b1779382d079f354479b18c394e9c0540eb..a42acc78e5291f6edef77e117e02b2e110d723b9 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -l -C "browser" 2 6 > tests/out.pidstat-lC.tmp
+LC_ALL=C TZ=GMT ./pidstat -l -C "browser" 2 6 > tests/out.pidstat-lC.tmp && diff -u tests/expected.pidstat-lC tests/out.pidstat-lC.tmp
diff --git a/tests/05365 b/tests/05365
deleted file mode 100644 (file)
index 55aae38..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-lC.tmp tests/expected.pidstat-lC
index 366780354ee84acca725d53dba6eb0ef063d55bf..4416c6a844f7d4624bcbbc7dc7dd8ecb444c12be 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -lt -G "server$" -p ALL 2 6 > tests/out.pidstat-lG.tmp
+LC_ALL=C TZ=GMT ./pidstat -lt -G "server$" -p ALL 2 6 > tests/out.pidstat-lG.tmp && diff -u tests/expected.pidstat-lG tests/out.pidstat-lG.tmp
diff --git a/tests/05375 b/tests/05375
deleted file mode 100644 (file)
index 1416c75..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-lG.tmp tests/expected.pidstat-lG
index 402280a7a394203d467ae5b9b743ca49dcc48103..931fe8f5794a2671a8e5587c90a388b9f7c665ce 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -T ALL -t -dRrsuvw --dec=1 > tests/out.pidstat-dec.tmp
+LC_ALL=C TZ=GMT ./pidstat -T ALL -t -dRrsuvw --dec=1 > tests/out.pidstat-dec.tmp && diff -u tests/expected.pidstat-dec tests/out.pidstat-dec.tmp
diff --git a/tests/05385 b/tests/05385
deleted file mode 100644 (file)
index da08a30..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-dec.tmp tests/expected.pidstat-dec
index 608adfe6be54d339e32f9626931bf6bb8b47db7c..3ef914b8853c4a228f4dc44ffb7920653b0623aa 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -T ALL -t -dRrsuvw -H -h 2 1 > tests/out.pidstat-Hh.tmp
+LC_ALL=C TZ=GMT ./pidstat -T ALL -t -dRrsuvw -H -h 2 1 > tests/out.pidstat-Hh.tmp && diff -u tests/expected.pidstat-Hh tests/out.pidstat-Hh.tmp
diff --git a/tests/05395 b/tests/05395
deleted file mode 100644 (file)
index b79a273..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-Hh.tmp tests/expected.pidstat-Hh
index 0886c14ea763d182e7e4f6c5ebbb4590398e9345..b552dfb9a0c1ce8173c085c9d0026da108d99837 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -T ALL -dRrsuvw --human -I 2 1 > tests/out.pidstat-I.tmp
+LC_ALL=C TZ=GMT ./pidstat -T ALL -dRrsuvw --human -I 2 1 > tests/out.pidstat-I.tmp && diff -u tests/expected.pidstat-I tests/out.pidstat-I.tmp
diff --git a/tests/05405 b/tests/05405
deleted file mode 100644 (file)
index 252c173..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-I.tmp tests/expected.pidstat-I
index 89e246f19b0bc9bc12ee512210e452e77199f0ee..8e182bb19ba3d1a9fa50e70860217e5fceb4fa0f 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -T CHILD -u -U 2 1 > tests/out.pidstat-U.tmp
+LC_ALL=C TZ=GMT ./pidstat -T CHILD -u -U 2 1 > tests/out.pidstat-U.tmp && diff -u tests/expected.pidstat-U tests/out.pidstat-U.tmp
diff --git a/tests/05415 b/tests/05415
deleted file mode 100644 (file)
index 62f5047..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-U.tmp tests/expected.pidstat-U
index 95eda5c03d99c5da015c94fef4a74087c01c4247..5b8396ee3ffa940bfc16623e7fba61f2b8fe67c4 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -t -rw -u -U foo 2 1 > tests/out.pidstat-Ufoo.tmp
+LC_ALL=C TZ=GMT ./pidstat -t -rw -u -U foo 2 1 > tests/out.pidstat-Ufoo.tmp && diff -u tests/expected.pidstat-Ufoo tests/out.pidstat-Ufoo.tmp
diff --git a/tests/05425 b/tests/05425
deleted file mode 100644 (file)
index c4f8300..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-Ufoo.tmp tests/expected.pidstat-Ufoo
index af9dcd0ed9fede2f31fccaf9aa6fceef653886d5..fa40175ba25720f06b6bdd18e0a40698eb90346a 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -t -rw -u -U root 2 1 > tests/out.pidstat-Uroot.tmp
+LC_ALL=C TZ=GMT ./pidstat -t -rw -u -U root 2 1 > tests/out.pidstat-Uroot.tmp && diff -u tests/expected.pidstat-Uroot tests/out.pidstat-Uroot.tmp
diff --git a/tests/05435 b/tests/05435
deleted file mode 100644 (file)
index 8b790b2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-Uroot.tmp tests/expected.pidstat-Uroot
index 8c19a9d7391d7d424047232949cad66dde9e5531..9469bcd0c0af6c5162df1891f151475da5610aa7 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat -t -svwu -p 21342,1234,7900,9009 2 6 > tests/out.pidstat-plist.tmp
+LC_ALL=C TZ=GMT ./pidstat -t -svwu -p 21342,1234,7900,9009 2 6 > tests/out.pidstat-plist.tmp && diff -u tests/expected.pidstat-plist tests/out.pidstat-plist.tmp
diff --git a/tests/05445 b/tests/05445
deleted file mode 100644 (file)
index 26c2ea2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-plist.tmp tests/expected.pidstat-plist
index 2ed535968a2fcde3be7837611d14eaa8086f6f90..239a1d5ada872a12df78cc9c71888e79daa7ec83 100644 (file)
@@ -1,3 +1,3 @@
 rm -f tests/root
 ln -s root1 tests/root
-LC_ALL=C TZ=GMT ./pidstat 2 6 -t -e sleep 1 > tests/out.pidstat-e.tmp
+LC_ALL=C TZ=GMT ./pidstat 2 6 -t -e sleep 1 > tests/out.pidstat-e.tmp && diff -u tests/expected.pidstat-e tests/out.pidstat-e.tmp
diff --git a/tests/05455 b/tests/05455
deleted file mode 100644 (file)
index 6eb9997..0000000
+++ /dev/null
@@ -1 +0,0 @@
-diff -u tests/out.pidstat-e.tmp tests/expected.pidstat-e
index 079970ed4b567b2f1e58e584c216d48fba194984..18c42549b263b4830f15cddd1f66f0cf81085119 100644 (file)
@@ -22,9 +22,6 @@ NOTES:
        [Don't take into account sensors statistics which are not read from test root directory]
 00132  LC_ALL=C TZ=GMT ./sar -A -I 2-5 -P 3 -f tests/data.tmp > tests/out3.sar-all.tmp
        [Check that -A doesn't necessarily imply -I ALL -P ALL]
-00134  diff -u tests/out.u.tmp tests/expected.sar-u
-00136  diff -u tests/out.sar-all.tmp tests/expected.sar-all
-00137  diff -u tests/out3.sar-all.tmp tests/expected3.sar-all
 
 =====  Appending data to data.tmp
 00140  TZ=GMT ./sadc --unix_time=1555595649 tests/data.tmp
@@ -33,30 +30,20 @@ NOTES:
 =====  sar: Reading data.tmp
 00160  LC_ALL=C TZ=GMT ./sar -C -u -P ALL -f tests/data.tmp > tests/out2.sar-u.tmp
 00161  LC_ALL=C TZ=GMT ./sar -A -f tests/data.tmp > tests/out2.sar-all.tmp
-00164  diff -u tests/out2.sar-u.tmp tests/expected2.sar-u
-00166  diff -u tests/out2.sar-all.tmp tests/expected2.sar-all
 00170  LC_ALL=C TZ=GMT ./sar --pretty -d -f tests/data.tmp > tests/out.sar-pretty.tmp
-00172  diff -u tests/out.sar-pretty.tmp tests/expected.sar-pretty
 
 =====  sar: Playing with environment variables
 00180  LC_ALL=C TZ=GMT S_TIME_FORMAT=ISO S_COLORS= ./sar -C -u --getenv -f tests/data.tmp > tests/out.sar-ISO.tmp
-00182  diff -u tests/out.sar-ISO.tmp tests/expected.sar-ISO
 00184  LC_ALL=C TZ=GMT S_TIME_FORMAT=ISO S_COLORS=never ./sar -C -u --getenv -f tests/data.tmp > tests/out.sar-never.tmp
-00186  diff -u tests/out.sar-never.tmp tests/expected.sar-autonever
 00188  LC_ALL=C TZ=GMT S_TIME_FORMAT=ISO S_COLORS=auto ./sar -C -u --getenv -f tests/data.tmp > tests/out.sar-auto.tmp
-00189  diff -u tests/out.sar-auto.tmp tests/expected.sar-autonever
 00190  LC_ALL=C TZ=GMT S_TIME_FORMAT= S_COLORS=always S_COLORS_SGR="C=33;22:H=31;1:I=32;22:M=35;1:N=34;1:R=31;22:Z=36;22" ./sar -C -u --getenv -f tests/data.tmp > tests/out.sar-always.tmp
-00192  diff -u tests/out.sar-always.tmp tests/expected.sar-always
 
 =====  sar: Playing with sa1 and sa2 shell scripts
 00200  ./sa1 --boot; ./sa1 --unix_time=1555593629 1 1; ./sa1 --unix_time=1555593649 1 1
 00205  LC_ALL=C TZ=GMT ./sar -f tests/sa18 > tests/out.sa1.tmp
-00208  diff -u tests/out.sa1.tmp tests/expected.sa1
 00220  LC_ALL=C TZ=GMT ./sa2 -A && mv tests/sar${DATE} tests/out.sa2.tmp && rm -f tests/sa${DATE}
-00225  diff -u tests/out.sa2.tmp tests/expected.sa2
 00230  ./cron/sysstat.sleep post hibernate
 00235  LC_ALL=C TZ=GMT ./sar -f tests/sa01 -C > tests/out.sa1-sleep.tmp
-00238  diff -u tests/out.sa1-sleep.tmp tests/expected.sa1-sleep
 
 =====  Checking JSON output validity
 00300  ./sadf -j tests/data.tmp -C -- -A | $VER_JSON >/dev/null && ./sadf -j tests/data.tmp | $VER_JSON >/dev/null && ./sadf -t -j tests/data.tmp | $VER_JSON >/dev/null
@@ -85,210 +72,138 @@ NOTES:
 
 =====  Checking sadf output
 00500  LC_ALL=C ./sadf -p tests/data.tmp -C -- -A > tests/out.sadf-p.tmp
-00501  diff -u tests/out.sadf-p.tmp tests/expected.sadf-p
 00510  LC_ALL=C ./sadf -d tests/data.tmp -C -- -A > tests/out.sadf-d.tmp
-00511  diff -u tests/out.sadf-d.tmp tests/expected.sadf-d
 00515  LC_ALL=C ./sadf -d tests/data.tmp -- -qu > tests/out.sadf-d-qu.tmp
-00516  diff -u tests/out.sadf-d-qu.tmp tests/expected.sadf-d-qu
 00520  LC_ALL=C ./sadf -x tests/data.tmp -C -- -A > tests/out.sadf-x.tmp
-00521  diff -u tests/out.sadf-x.tmp tests/expected.sadf-x
 00530  LC_ALL=C ./sadf -j tests/data.tmp -C -- -A > tests/out.sadf-j.tmp
-00531  diff -u tests/out.sadf-j.tmp tests/expected.sadf-j
 00540  LC_ALL=C ./sadf -g tests/data.tmp -C -- -A > tests/out.sadf-g.tmp
-00541  diff -u tests/out.sadf-g.tmp tests/expected.sadf-g
 00542  LC_ALL=C ./sadf -O height=370 -g tests/data.tmp > tests/out3.sadf-g.tmp
-00543  diff -u tests/out3.sadf-g.tmp tests/expected3.sadf-g
 00545  LC_ALL=C ./sadf -g tests/data.tmp -- -F MOUNT > tests/out1.sadf-g.tmp
-00546  diff -u tests/out1.sadf-g.tmp tests/expected1.sadf-g
 00550  LC_ALL=C TZ=GMT ./sadf -g -O autoscale,packed,oneday,showidle,showtoc,skipempty,showinfo,bwcol tests/data.tmp -T -C -- -A > tests/out2.sadf-g.tmp
-00551  diff -u tests/out2.sadf-g.tmp tests/expected2.sadf-g
 00555  LC_ALL=C TZ=GMT S_COLORS_PALETTE="0=000000:1=1a1aff:2=1affb2:3=b21aff:4=1ab2ff:5=ff1a1a:6=ffb31a:7=b2ff1a:8=efefef:9=000000:A=1a1aff:B=1affb2:C=b21aff:D=1ab2ff:E=ff1a1a:F=ffb31a:G=cc3300:H=000000:I=000000:K=ffffff:L=000000:T=000000:W=000000:X=000000" ./sadf -g --getenv -O customcol tests/data.tmp -C > tests/out.sadf-g-cc.tmp
-00557  diff -u tests/out.sadf-g-cc.tmp tests/expected.sadf-g-cc
 00560  LC_ALL=C ./sadf -H tests/data.tmp > tests/out.sadf-H.tmp
-00561  diff -u tests/out.sadf-H.tmp tests/expected.sadf-H
 00570  ./sadf -r -O debug tests/data.tmp -C -- -A > tests/out.sadf-r.tmp
-00571  diff -u tests/out.sadf-r.tmp tests/expected.sadf-r
 00580  LC_ALL=C ./sadf -d -s 13:20:20 -e 13:20:40 --iface=enp6s0 --dev=sda --fs=/dev/sda6 tests/data.tmp -- -n DEV -Fdp > tests/out.sadf-se.tmp
-00582  diff -u tests/out.sadf-se.tmp tests/expected.sadf-se
 00590  LC_ALL=C ./sadf -l -O pcparchive=tests/pcpar tests/data.tmp -C -- -A
 
 =====  Checking sadf conversion
 00600  ./sadf -c tests/data-9.1.6 > tests/data-9.1.6.tmp
 00602  ./sadf -c tests/data-9.1.6 -O hz=250 > tests/data-9.1.6-hz.tmp
 00605  LC_ALL=C TZ=GMT ./sar -C -A -f tests/data-9.1.6.tmp > tests/out.data-9.1.6.tmp
-00607  diff -u tests/out.data-9.1.6.tmp tests/expected.data-9.1.6
 00608  LC_ALL=C TZ=GMT ./sar -f tests/data-9.1.6-hz.tmp > tests/out.data-9.1.6-hz.tmp
-00609  diff -u tests/out.data-9.1.6-hz.tmp tests/expected.data-9.1.6-hz
 00610  ./sadf -c tests/data-10.3.1 > tests/data-10.3.1.tmp
 00615  LC_ALL=C TZ=GMT ./sar -C -A -f tests/data-10.3.1.tmp > tests/out.data-10.3.1.tmp
-00617  diff -u tests/out.data-10.3.1.tmp tests/expected.data-10.3.1
 00620  ./sadf -c tests/data-11.6.5 > tests/data-11.6.5.tmp
 00625  LC_ALL=C TZ=GMT ./sar -C -A -f tests/data-11.6.5.tmp > tests/out.data-11.6.5.tmp
-00627  diff -u tests/out.data-11.6.5.tmp tests/expected.data-11.6.5    
 00650  LC_ALL=C TZ=GMT ./sar -AC -f tests/data-12.0.0 > tests/out.data-12.0.0.tmp
-00655  diff -u tests/out.data-12.0.0.tmp tests/expected.data-12.0.0
 00660  LC_ALL=C TZ=GMT ./sadf -H tests/data-9.1.6-hz.tmp > tests/out.sadf-H-hz.tmp
-00662  diff -u tests/out.sadf-H-hz.tmp tests/expected.sadf-H-hz
 00664  LC_ALL=C TZ=GMT ./sadf -r -O debug tests/data-9.1.6-hz.tmp > tests/out.sadf-r-hz.tmp
-00665  diff -u tests/out.sadf-r-hz.tmp tests/expected.sadf-r-hz
 
 =====  Reading datafile from another architecture
 00700  LC_ALL=C TZ=GMT ./sar -C -A -f tests/data-ppc-11.7.2 > tests/out.data-ppc-11.7.2.tmp
-00702  diff -u tests/out.data-ppc-11.7.2.tmp tests/expected.data-ppc-11.7.2
 
 =====  Reading datafile with non printable chrs in comment (created using hexedit)
 00720  LC_ALL=C TZ=GMT ./sar -C -f tests/data-non-printable > tests/out.sar-non-printable.tmp
-00722  diff -u tests/out.sar-non-printable.tmp tests/expected.sar-non-printable
 
 =====  Reading data.tmp using an old sysstat version
 00750  LC_ALL=C TZ=GMT ./tests/ini/inisar -C -A -f tests/data.tmp > tests/out.data-ini.tmp
-00752  diff -u tests/out.data-ini.tmp tests/expected.data-ini
        [There may be some small differences in ext disks stats between initial and current version
        outputs, because initial version doesn't take into account discard fields]
 
 =====  Reading datafile with extra structures
 00770  LC_ALL=C TZ=GMT ./sar -A -f tests/data-extra-12.1.7 > tests/out.data-extra-12.1.7.tmp
-00772  diff -u tests/out.data-extra-12.1.7.tmp tests/expected.data-extra-12.1.7
 
 =====  Reading datafiles with unknown activity type or format
 00780  LC_ALL=C TZ=GMT ./sar -P ALL -f tests/data-ukwn > tests/out.sar-data-ukwn.tmp
-00781  diff -u tests/out.sar-data-ukwn.tmp tests/expected.sar-data-ukwn
 00784  LC_ALL=C TZ=GMT ./sar -w -f tests/data-ukwn > tests/out2.sar-data-ukwn.tmp
-00785  diff -u tests/out2.sar-data-ukwn.tmp tests/expected2.sar-data-ukwn
 00787  LC_ALL=C ./sadf -H tests/data-ukwn > tests/out.sadf-data-ukwn.tmp
-00788  diff -u tests/out.sadf-data-ukwn.tmp tests/expected.sadf-data-ukwn
 00790  LC_ALL=C TZ=GMT ./sar -A -f tests/data-ukwn0 > tests/out.sar-data-ukwn0.tmp
-00791  diff -u tests/out.sar-data-ukwn0.tmp tests/expected.sar-data-ukwn0
 00795  LC_ALL=C ./sadf -H tests/data-ukwn0 > tests/out.sadf-data-ukwn0.tmp
-00796  diff -u tests/out.sadf-data-ukwn0.tmp tests/expected.sadf-data-ukwn0
 
 =====  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
-00802  diff -u tests/out.sar-iface.tmp tests/expected.sar-iface
 00810  LC_ALL=C TZ=GMT ./sar --dev=sda -dp -f tests/data.tmp > tests/out.sar-dev.tmp
-00812  diff -u tests/out.sar-dev.tmp tests/expected.sar-dev
 00820  LC_ALL=C TZ=GMT ./sar --fs=/dev/sda6,/dev/foo -F -f tests/data.tmp > tests/out.sar-fs.tmp
-00822  diff -u tests/out.sar-fs.tmp tests/expected.sar-fs
 00830  LC_ALL=C TZ=GMT ./sar --dec=0 -A -f tests/data.tmp > tests/out.sar-dec.tmp
-00832  diff -u tests/out.sar-dec.tmp tests/expected.sar-dec
 00840  LC_ALL=C TZ=GMT ./sar --human -A -f tests/data.tmp > tests/out.sar-human.tmp
-00842  diff -u tests/out.sar-human.tmp tests/expected.sar-human
 00850  LC_ALL=C TZ=GMT ./sar -s 13:20:20 -e 13:20:40 -f tests/data.tmp > tests/out.sar-se.tmp
-00852  diff -u tests/out.sar-se.tmp tests/expected.sar-se
 00860  LC_ALL=C TZ=GMT ./sar -i 60 -uw -P ALL -f tests/data.tmp > tests/out.sar-i.tmp
-00862  diff -u tests/out.sar-i.tmp tests/expected.sar-i
        [WARNING: /proc/uptime files are not consistent with unix_time values used. Don't trust timestamps!]
 00870  LC_ALL=C TZ=GMT ./sar 60 -uw -P ALL -f tests/data.tmp > tests/out2.sar-i.tmp
-00872  diff -u tests/out2.sar-i.tmp tests/expected.sar-i
 00880  LC_ALL=C TZ=GMT ./sar 60 2 -f tests/data.tmp > tests/out3.sar-i.tmp
-00882  diff -u tests/out3.sar-i.tmp tests/expected3.sar-i
 00900  LC_ALL=C TZ=GMT ./sar -dh -j UUID -f tests/data.tmp > tests/out.sar-jUUID.tmp
-00902  diff -u tests/out.sar-jUUID.tmp tests/expected.sar-jUUID
 00904  LC_ALL=C TZ=GMT ./sar -dh -j ID -f tests/data.tmp > tests/out.sar-jID.tmp
        [Done on root4. IDs are determined at run-time using ./dev/disk/by-id contents]
-00905  diff -u tests/out.sar-jID.tmp tests/expected.sar-jID
 00906  LC_ALL=C TZ=GMT ./sar -dh -j SID -f tests/data.tmp > tests/out.sar-jSID.tmp
-00907  diff -u tests/out.sar-jSID.tmp tests/expected.sar-jSID
 00910  LC_ALL=C TZ=GMT ./sar -uw -f tests/data-cd -s 23:59:58 -e 00:00:00 > tests/out.sar-cd.tmp
        [Testing options -s/-e on a file contents spanning two consecutive days]
        [Work only with very simple file contents (no LINUX RESTART or COMMENT records)]
        [Note: "11:00:00 PM" is "23:00:00" - "12:00:00 AM" is "00:00:00"]
-00912  diff -u tests/out.sar-cd.tmp tests/expected.sar-cd
 00920  LC_ALL=C TZ=GMT ./sar -f tests/data.tmp -e 13:30 -z -n DEV -dp > tests/out.sar-z.tmp
-00922  diff -u tests/out.sar-z.tmp tests/expected.sar-z
 00930  LC_ALL=C TZ=GMT ./sar -ur 0 > tests/out.sar-0.tmp
-00932  diff -u tests/out.sar-0.tmp tests/expected.sar-0
 00940  LC_ALL=C TZ=GMT ./sar 1 2 > tests/out.sar.tmp
-00942  diff -u tests/out.sar.tmp tests/expected.sar1
 00950  LC_ALL=C TZ=GMT ./sar -qu 0 > tests/out.sar-qu.tmp
-00952  diff -u tests/out.sar-qu.tmp tests/expected.sar-qu
 00954  LC_ALL=C TZ=GMT ./sar -q -u 0 > tests/out1.sar-qu.tmp
-00956  diff -u tests/out1.sar-qu.tmp tests/expected.sar-qu
 00958  LC_ALL=C TZ=GMT ./sar -q IO 0 > tests/out.sar-qIO.tmp
-00959  diff -u tests/out.sar-qIO.tmp tests/expected.sar-qIO
 00960  LC_ALL=C TZ=GMT ./sar -q MEM,IO 0 > tests/out.sar-qMEMIO.tmp
-00962  diff -u tests/out.sar-qMEMIO.tmp tests/expected.sar-qMEMIO
 00964  LC_ALL=C TZ=GMT ./sar -q PSI 0 > tests/out.sar-qPSI.tmp
-00966  diff -u tests/out.sar-qPSI.tmp tests/expected.sar-qPSI
 00968  LC_ALL=C TZ=GMT ./sar -q ALL 0 > tests/out.sar-qALL.tmp
-00969  diff -u tests/out.sar-qALL.tmp tests/expected.sar-qALL
 00970  LC_ALL=C TZ=GMT ./sar -q ALL 1 1 > tests/out1.sar-qALL.tmp
-00972  diff -u tests/out1.sar-qALL.tmp tests/expected1.sar-qALL
 00974  LC_ALL=C TZ=GMT ./sar -q PSI 1 1 2>&1 | grep "Requested activities not available" >/dev/null
 00976  LC_ALL=C TZ=GMT ./sar -q PSI 1 1 2>&1 | grep "Inconsistent input data" >/dev/null && exit 1 || exit 0
 00980  4 x TZ=GMT ./sadc --unix_time=xxxxxxx tests/data1.tmp 1 1 >/dev/null
 00982  LC_ALL=C TZ=GMT ./sar -f tests/data1.tmp -q ALL > tests/out2.sar-q.tmp
-00984  diff -u tests/out2.sar-q.tmp tests/expected2.sar-q
 
 =====  Creating data0.tmp and data1.tmp with no data inside
 01000  TZ=GMT ./sadc --unix_time=1555593609 -S A_NULL,A_PCSW tests/data0.tmp >/dev/null
 01010  4 x TZ=GMT ./sadc --unix_time=xxxxxxx tests/data1.tmp 1 1 >/dev/null
 01012  LC_ALL=C TZ=GMT ./sar -f tests/data1.tmp -q ALL > tests/out2.sar-qALL.tmp
-01014  diff -u tests/out2.sar-qALL.tmp tests/expected2.sar-qALL
 01020  LC_ALL=C TZ=GMT ./sadc --unix_time=1555593609 -S A_NULL,A_PSI_CPU tests/data1.tmp 1 1 2>&1 | grep "Requested activities not available"
 
 =====  sar/sadf: Reading data0.tmp
 01100  LC_ALL=C TZ=GMT ./sar -A -f tests/data0.tmp > tests/out0.sar-A.tmp
-01102  diff -u tests/out0.sar-A.tmp tests/expected0.sar-A
 01110  ./sadf tests/data0.tmp -- -A > tests/out0.sadf.tmp
-01112  diff -u tests/out0.sadf.tmp tests/expected0.sadf
 01120  ./sadf -x tests/data0.tmp -- -A > tests/out0.sadf-x.tmp
-01122  diff -u tests/out0.sadf-x.tmp tests/expected0.sadf-x
 01130  ./sadf -j tests/data0.tmp -- -A | $VER_JSON >/dev/null
 01140  LC_ALL=C TZ=GMT ./sar -r -f tests/data0.tmp 2>&1 | grep "Requested activities not available" >/dev/null
 01145  LC_ALL=C ./sadf tests/data0.tmp 2>&1 | grep "Requested activities not available" >/dev/null
 01150  LC_ALL=C ./sadf -g tests/data0.tmp -- -A > tests/out0.sadf-g.tmp
-01152  diff -u tests/out0.sadf-g.tmp tests/expected0.sadf-g
 
 =====  Append data to data0.tmp then read its contents
 01200  2 x TZ=GMT ./sadc --unix_time=xxxxxxxxx [ -S XALL ] tests/data0.tmp [ 1 1 ] >/dev/null
 01210  LC_ALL=C TZ=GMT ./sar -A -f tests/data0.tmp > tests/out01.sar-A.tmp
-01212  diff -u tests/out01.sar-A.tmp tests/expected01.sar-A
 01220  ./sadf -d tests/data0.tmp -- -A > tests/out01.sadf-d.tmp
-01222  diff -u tests/out01.sadf-d.tmp tests/expected01.sadf-d
 01230  ./sadf -j tests/data0.tmp -- -A | $VER_JSON >/dev/null
 01240  LC_ALL=C ./sadf -g tests/data0.tmp -- -A > tests/out01.sadf-g.tmp
-01242  diff -u tests/out01.sadf-g.tmp tests/expected01.sadf-g
 01250  LC_ALL=C ./sadf -H tests/data0.tmp > tests/out01.sadf-H.tmp
-01252  diff -u tests/out01.sadf-H.tmp tests/expected01.sadf-H
 
 =====  Playing with standard activity datafiles
 01300  echo foo >tests/sa01 ; ./sadc 1 1 - 2>&1 | grep "Invalid system activity" >/dev/null
 01305  LC_ALL=C TZ=GMT ./sadc -F 1 1 -
 01310  LC_ALL=C TZ=GMT ./sar -f tests/sa01 > tests/out3.sar-u.tmp
-01312  diff -u tests/out3.sar-u.tmp tests/expected3.sar-u
 01314  LC_ALL=C TZ=GMT ./sar > tests/out31.sar-u.tmp
-01316  diff -u tests/out31.sar-u.tmp tests/expected3.sar-u
 01318  LC_ALL=C TZ=GMT ./sar -f tests > tests/out34.sar-u.tmp
-01319  diff -u tests/out34.sar-u.tmp tests/expected3.sar-u
 01320  LC_ALL=C TZ=GMT ./sadc -D -
 01330  LC_ALL=C TZ=GMT ./sar -f tests/sa19700101 > tests/out32.sar-u.tmp
-01332  diff -u tests/out32.sar-u.tmp tests/expected32.sar-u
 01335  LC_ALL=C TZ=GMT ./sar > tests/out33.sar-u.tmp
-01337  diff -u tests/out33.sar-u.tmp tests/expected32.sar-u
 01340  ./sadf > tests/out3.sadf.tmp
-01342  diff -u tests/out3.sadf.tmp tests/expected3.sadf
 01350  TZ=GMT ./sadc --unix_time=1556755199 - 1 3
        [Create sa01 and sa02 - Timestamp can be obtained with: date +%s --date='Wed May  1 23:59:59 CEST 2019']
-01352  LC_ALL=C TZ=GMT ./sar -f tests/sa01 > tests/out33.sar-u.tmp; LC_ALL=C TZ=GMT ./sar -f tests/sa02 >> tests/out33.sar-u.tmp
-01355  diff -u tests/out33.sar-u.tmp tests/expected33.sar-u
+01352  LC_ALL=C TZ=GMT ./sar -f tests/sa01 > tests/out33.sar-u.tmp
+01355  LC_ALL=C TZ=GMT ./sar -f tests/sa02 >> tests/out33.sar-u.tmp
 01360  LC_ALL=C TZ=GMT ./sar --unix_time=1556755203 -1 > tests/out.sar-1.tmp
        [Go to day 02 and try to read sa01]
-01362  diff -u tests/out.sar-1.tmp tests/expected.sar-1
 01370  LC_ALL=C TZ=GMT ./sar --unix_time=1556755203 -D -o 1 2 > /dev/null
        [Create datafile sa20190502]
 01372  LC_ALL=C TZ=GMT ./sar -f tests/sa20190502 > tests/out.sar-D.tmp
-01375  diff -u tests/out.sar-D.tmp tests/expected.sar-D
 01380  LC_ALL=C TZ=GMT ./sar --unix_time=1556755203 -o tests/sa-sigint.tmp 1 10 > /dev/null
        [Create binary datafile sa-sigint.tmp. Stop with a simulated Ctrl/C]
 01382  LC_ALL=C TZ=GMT ./sar -f tests/sa-sigint.tmp -m CPU > tests/out.sar-sigint.tmp
-01385  diff -u tests/out.sar-sigint.tmp tests/expected.sar-sigint
 
 =====  Testing error cases
 01400  LC_ALL=C TZ=GMT ./sar -f tests/data-trunc 2>&1 | grep "End of system activity file unexpected" >/dev/null
 01405  LC_ALL=C TZ=GMT ./sadf -g tests/data-trunc -- -A > tests/out.sadf-g-trunc.tmp 2>/dev/null
        [Check that sadf -g terminates properly on truncated input file]
-01406  diff -u tests/out.sadf-g-trunc.tmp tests/expected.sadf-g-trunc
 01410  LC_ALL=C ./sar 0 0 2>&1 | grep "Usage:" >/dev/null
 01415  LC_ALL=C ./sar 0 2 2>&1 | grep "Usage:" >/dev/null
 01420  LC_ALL=C ./sar 2 0 2>&1 | grep "Usage:" >/dev/null
@@ -300,136 +215,83 @@ NOTES:
 
 =====  Specific tests for sensors statistics (basic sensor output already tested using data-11.6.5 conversion)
 01500  LC_ALL=C TZ=GMT ./sadf -d tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-d.tmp
-01505  diff -u tests/out.data-11.6.5-sadf-d.tmp tests/expected.data-11.6.5-sadf-d
 01510  LC_ALL=C TZ=GMT ./sadf -p tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-p.tmp
-01515  diff -u tests/out.data-11.6.5-sadf-p.tmp tests/expected.data-11.6.5-sadf-p
 01520  LC_ALL=C TZ=GMT ./sadf -r tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-r.tmp
-01525  diff -u tests/out.data-11.6.5-sadf-r.tmp tests/expected.data-11.6.5-sadf-r
 01530  LC_ALL=C TZ=GMT ./sadf -g tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-g.tmp
-01535  diff -u tests/out.data-11.6.5-sadf-g.tmp tests/expected.data-11.6.5-sadf-g
 01540  LC_ALL=C TZ=GMT ./sadf -j tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-j.tmp
-01545  diff -u tests/out.data-11.6.5-sadf-j.tmp tests/expected.data-11.6.5-sadf-j
 01547  cat tests/out.data-11.6.5-sadf-j.tmp | $VER_JSON >/dev/null;
 01550  LC_ALL=C TZ=GMT ./sadf -x tests/data-11.6.5.tmp -- -m FAN,IN,TEMP > tests/out.data-11.6.5-sadf-x.tmp
-01555  diff -u tests/out.data-11.6.5-sadf-x.tmp tests/expected.data-11.6.5-sadf-x
 01557  cat tests/out.data-11.6.5-sadf-x.tmp | $VER_XML --schema xml/sysstat.xsd - >/dev/null;
 01559  cat tests/out.data-11.6.5-sadf-x.tmp | $VER_XML --dtdvalid xml/sysstat-*.dtd - >/dev/null;
 
 =====  Specific tests for A_PWR_FREQ statistics
 01600  TZ=GMT ./sadc --unix_time=1555593609 -S A_NULL,A_PWR_FREQ tests/data-wghfreq.tmp 1 3 >/dev/null
 01610  LC_ALL=C TZ=GMT ./sar -f tests/data-wghfreq.tmp -m FREQ -P ALL > tests/out.sar-m-freq.tmp
-01615  diff -u tests/out.sar-m-freq.tmp tests/expected.sar-m-freq
 01620  LC_ALL=C TZ=GMT ./sadf -d tests/data-wghfreq.tmp -- -m FREQ -P ALL > tests/out.data-wghfreq-sadf-d.tmp
-01625  diff -u tests/out.data-wghfreq-sadf-d.tmp tests/expected.data-wghfreq-sadf-d
 01630  LC_ALL=C TZ=GMT ./sadf -p tests/data-wghfreq.tmp -- -m FREQ -P ALL > tests/out.data-wghfreq-sadf-p.tmp
-01635  diff -u tests/out.data-wghfreq-sadf-p.tmp tests/expected.data-wghfreq-sadf-p
 01640  LC_ALL=C TZ=GMT ./sadf -r tests/data-wghfreq.tmp -- -m FREQ -P ALL > tests/out.data-wghfreq-sadf-r.tmp
-01645  diff -u tests/out.data-wghfreq-sadf-r.tmp tests/expected.data-wghfreq-sadf-r
 01650  LC_ALL=C TZ=GMT ./sadf -j tests/data-wghfreq.tmp -- -m FREQ -P ALL > tests/out.data-wghfreq-sadf-j.tmp
-01655  diff -u tests/out.data-wghfreq-sadf-j.tmp tests/expected.data-wghfreq-sadf-j
 01657  cat tests/out.data-wghfreq-sadf-j.tmp | $VER_JSON >/dev/null;
 01660  LC_ALL=C TZ=GMT ./sadf -x tests/data-wghfreq.tmp -- -m FREQ -P ALL > tests/out.data-wghfreq-sadf-x.tmp
-01665  diff -u tests/out.data-wghfreq-sadf-x.tmp tests/expected.data-wghfreq-sadf-x
 01667  cat tests/out.data-wghfreq-sadf-x.tmp | $VER_XML --schema xml/sysstat.xsd - >/dev/null;
 01669  cat tests/out.data-wghfreq-sadf-x.tmp | $VER_XML --dtdvalid xml/sysstat-*.dtd - >/dev/null;
 
 =====  Specific tests
 01700  LC_ALL=C TZ=GMT ./sar -P ALL -u 2 3 > tests/out.sar-cpu6off.tmp
        [Starting at root3 where CPU#6 is already offline]
-01705  diff -u tests/out.sar-cpu6off.tmp tests/expected.sar-cpu6off
 01710  LC_ALL=C TZ=GMT ./sar -P ALL -u -n SOFT 2 3 > tests/out.sar-cpu8onoff.tmp
-01705  diff -u tests/out.sar-cpu8onoff.tmp tests/expected.sar-cpu8onoff
        [CPU#8 - Last in list - online then offline]
 01720  LC_ALL=C TZ=GMT ./sar -P ALL -u -n SOFT 2 3 > tests/out.sar-cpu8off.tmp
        [CPU#8 - Last in list - already offline]
-01725  diff -u tests/out.sar-cpu8off.tmp tests/expected.sar-cpu8off
 
 =====  iostat tests (basic output)
 02010  LC_ALL=C TZ=GMT ./iostat 2 3 > tests/out.iostat.tmp
-02015  diff -u tests/out.iostat.tmp tests/expected.iostat
 02020  LC_ALL=C TZ=GMT ./iostat ALL 2 3 > tests/out.iostat-ALL.tmp
-02025  diff -u tests/out.iostat-ALL.tmp tests/expected.iostat-ALL
 02030  LC_ALL=C TZ=GMT ./iostat -d -p ALL 2 3 > tests/out.iostat-p-ALL.tmp
-02035  diff -u tests/out.iostat-p-ALL.tmp tests/expected.iostat-p-ALL
 02040  LC_ALL=C TZ=GMT ./iostat -p sda 2 3 > tests/out.iostat-p-sda.tmp
-02045  diff -u tests/out.iostat-p-sda.tmp tests/expected.iostat-p-sda
 02050  LC_ALL=C TZ=GMT ./iostat -d ALL -p ALL 2 3 > tests/out.iostat-ALL-p-ALL.tmp
-02055  diff -u tests/out.iostat-ALL-p-ALL.tmp tests/expected.iostat-ALL-p-ALL
 02060  LC_ALL=C TZ=GMT ./iostat > tests/out.iostat-0.tmp
-02065  diff -u tests/out.iostat-0.tmp tests/expected.iostat-0
 02070  LC_ALL=C TZ=GMT ./iostat sda sdc 2 3 > tests/out.iostat-list.tmp
-02075  diff -u tests/out.iostat-list.tmp tests/expected.iostat-list
 02080  LC_ALL=C TZ=GMT ./iostat --pretty -d ALL -p ALL 2 2 > tests/out.iostat-pretty.tmp
-02085  diff -u tests/out.iostat-pretty.tmp tests/expected.iostat-pretty
 
 =====  iostat extended statistics
 02110  LC_ALL=C TZ=GMT ./iostat -x 1 2 > tests/out.iostat-x.tmp
-02115  diff -u tests/out.iostat-x.tmp tests/expected.iostat-x
 02120  LC_ALL=C TZ=GMT ./iostat -x ALL 1 2 > tests/out.iostat-x-ALL.tmp
-02125  diff -u tests/out.iostat-x-ALL.tmp tests/expected.iostat-x-ALL
 02130  LC_ALL=C TZ=GMT ./iostat -x -p ALL 1 2 > tests/out.iostat-x-p-ALL.tmp
-02135  diff -u tests/out.iostat-x-p-ALL.tmp tests/expected.iostat-x-p-ALL
 02140  LC_ALL=C TZ=GMT ./iostat -x -p sda 1 2 > tests/out.iostat-x-p-sda.tmp
-02145  diff -u tests/out.iostat-x-p-sda.tmp tests/expected.iostat-x-p-sda
 02150  LC_ALL=C TZ=GMT ./iostat -dx ALL -p ALL 1 7 > tests/out.iostat-x-ALL-p-ALL.tmp
-02155  diff -u tests/out.iostat-x-ALL-p-ALL.tmp tests/expected.iostat-x-ALL-p-ALL
 02160  LC_ALL=C TZ=GMT ./iostat -x > tests/out.iostat-x-0.tmp
-02165  diff -u tests/out.iostat-x-0.tmp tests/expected.iostat-x-0
 02170  LC_ALL=C TZ=GMT ./iostat -dx -p sdb,sdc > tests/out.iostat-x-list.tmp
-02175  diff -u tests/out.iostat-x-list.tmp tests/expected.iostat-x-list
 02180  LC_ALL=C TZ=GMT ./iostat -x ALL 1 3 > tests/out.iostat-x-ALL-flush.tmp
-02185  diff -u tests/out.iostat-x-ALL-flush.tmp tests/expected.iostat-x-ALL-flush
 
 =====  iostat tests (narrow/basic output)
 02210  LC_ALL=C TZ=GMT ./iostat -s 1 2 > tests/out.iostat-s.tmp
-02215  diff -u tests/out.iostat-s.tmp tests/expected.iostat-s
 02220  LC_ALL=C TZ=GMT ./iostat -ds ALL 1 2 > tests/out.iostat-s-ALL.tmp
-02225  diff -u tests/out.iostat-s-ALL.tmp tests/expected.iostat-s-ALL
 02230  LC_ALL=C TZ=GMT ./iostat -s sdb -p ALL 1 2 > tests/out.iostat-s-list-p.tmp
-02235  diff -u tests/out.iostat-s-list-p.tmp tests/expected.iostat-s-list-p
 02240  LC_ALL=C TZ=GMT ./iostat -s -p > tests/out.iostat-sp-0.tmp
-02245  diff -u tests/out.iostat-sp-0.tmp tests/expected.iostat-sp-0
 02250  LC_ALL=C TZ=GMT ./iostat -s ALL -p ALL 1 2 > tests/out.iostat-s-ALL-p-ALL.tmp
-02255  diff -u tests/out.iostat-s-ALL-p-ALL.tmp tests/expected.iostat-s-ALL-p-ALL
 02260  LC_ALL=C TZ=GMT ./iostat -s > tests/out.iostat-s-0.tmp
-02265  diff -u tests/out.iostat-s-0.tmp tests/expected.iostat-s-0
 02270  LC_ALL=C TZ=GMT ./iostat -ds sda -p sdb 1 2 > tests/out.iostat-s-list.tmp
-02275  diff -u tests/out.iostat-s-list.tmp tests/expected.iostat-s-list
 
 =====  iostat extended statistics (narrow output)
 02310  LC_ALL=C TZ=GMT ./iostat -xs 2 3 > tests/out.iostat-xs.tmp
-02315  diff -u tests/out.iostat-xs.tmp tests/expected.iostat-xs
 02320  LC_ALL=C TZ=GMT ./iostat -dxs /dev/sdb 2 3 > tests/out.iostat-xs-sdb.tmp
-02325  diff -u tests/out.iostat-xs-sdb.tmp tests/expected.iostat-xs-sdb
 02340  LC_ALL=C TZ=GMT ./iostat -dxs -p sda 2 3 > tests/out.iostat-xs-p-sda.tmp
-02345  diff -u tests/out.iostat-xs-p-sda.tmp tests/expected.iostat-xs-p-sda
 02370  LC_ALL=C TZ=GMT ./iostat -xs sda1 sda3 sdc1 -p sdb,sdd > tests/out.iostat-xs-list.tmp
-02375  diff -u tests/out.iostat-xs-list.tmp tests/expected.iostat-xs-list
 02380  LC_ALL=C TZ=GMT ./iostat -xs sda3 sda1 1 3 > tests/out.iostat-xs-list-part.tmp
-02385  diff -u tests/out.iostat-xs-list-part.tmp tests/expected.iostat-xs-list-part
 
 =====  Playing with iostat
 02410  LC_ALL=C TZ=GMT ./iostat 2 > tests/out.iostat-sigint.tmp
        [Simulate a Ctrl/C]
-02415  diff -u tests/out.iostat-sigint.tmp tests/expected.iostat-sigint
 02420  LC_ALL=C TZ=GMT ./iostat -d foo > tests/out.iostat-foo.tmp
-02425  diff -u tests/out.iostat-foo.tmp tests/expected.iostat-foo
 02430  LC_ALL=C TZ=GMT ./iostat -ct 1 2 > tests/out.iostat-ct.tmp
-02435  diff -u tests/out.iostat-ct.tmp tests/expected.iostat-ct
 02440  LC_ALL=C TZ=GMT ./iostat -d -g disks sda sdb -g other sdc sdd 1 2 > tests/out.iostat-g.tmp
-02445  diff -u tests/out.iostat-g.tmp tests/expected.iostat-g
 02450  LC_ALL=C TZ=GMT ./iostat -dH -g disks sda sdb -g other sdc sdd 1 2 > tests/out.iostat-gH.tmp
-02455  diff -u tests/out.iostat-gH.tmp tests/expected.iostat-gH
 02460  LC_ALL=C TZ=GMT ./iostat --dec=1 1 2 > tests/out.iostat-dec.tmp
-02465  diff -u tests/out.iostat-dec.tmp tests/expected.iostat-dec
 02470  LC_ALL=C TZ=GMT ./iostat -d -p ALL -j PATH > tests/out.iostat-jPATH.tmp
-02472  diff -u tests/out.iostat-jPATH.tmp tests/expected.iostat-jPATH
 02474  LC_ALL=C TZ=GMT ./iostat -d -p ALL -j ID > tests/out.iostat-jID.tmp
-02476  diff -u tests/out.iostat-jID.tmp tests/expected.iostat-jID
 02480  LC_ALL=C TZ=GMT ./iostat -d -p ALL -j LABEL > tests/out.iostat-jLABEL.tmp
-02482  diff -u tests/out.iostat-jLABEL.tmp tests/expected.iostat-jLABEL
 02484  LC_ALL=C TZ=GMT ./iostat -d -p ALL -j PARTUUID > tests/out.iostat-jPARTUUID.tmp
-02486  diff -u tests/out.iostat-jPARTUUID.tmp tests/expected.iostat-jPARTUUID
 
 =====  Testing iostat error cases
 02500  LC_ALL=C ./iostat 2 0 2>&1 | grep "Usage:" >/dev/null
@@ -441,87 +303,51 @@ NOTES:
 
 =====  Playing again with iostat
 02600  LC_ALL=C TZ=GMT ./iostat -ym 1 2 > tests/out.iostat-ym.tmp
-02605  diff -u tests/out.iostat-ym.tmp tests/expected.iostat-ym
 02610  LC_ALL=C TZ=GMT ./iostat --human > tests/out.iostat-human.tmp
-02615  diff -u tests/out.iostat-human.tmp tests/expected.iostat-human
 02620  LC_ALL=C TZ=GMT ./iostat -dh -p ALL > tests/out.iostat-h.tmp
-02625  diff -u tests/out.iostat-h.tmp tests/expected.iostat-h
 02630  LC_ALL=C TZ=GMT ./iostat -kz -p ALL 1 2 > tests/out.iostat-kz.tmp
-02635  diff -u tests/out.iostat-kz.tmp tests/expected.iostat-kz
 02640  LC_ALL=C TZ=GMT ./iostat -dN -p ALL > tests/out.iostat-N.tmp
-02645  diff -u tests/out.iostat-N.tmp tests/expected.iostat-N
 02650  LC_ALL=C TZ=GMT ./iostat -d -j LABEL OS SYSTEM 1 2 > tests/out.iostat-jLABEL-list.tmp
-02655  diff -u tests/out.iostat-jLABEL-list.tmp tests/expected.iostat-jLABEL-list
 02660  LC_ALL=C TZ=GMT ./iostat -dxs -j UUID 2578463f-6947-48c7-8b09-876a4145cfb1 1 2 > tests/out.iostat-jUUID-list.tmp
-02665  diff -u tests/out.iostat-jUUID-list.tmp tests/expected.iostat-jUUID-list
 02670  LC_ALL=C TZ=GMT ./iostat -g total sda -g foo 1 2 > tests/out.iostat-g2.tmp
-02675  diff -u tests/out.iostat-g2.tmp tests/expected.iostat-g2
 02680  LC_ALL=C TZ=GMT ./iostat -g total ALL 1 2 > tests/out.iostat-gALL.tmp
-02685  diff -u tests/out.iostat-gALL.tmp tests/expected.iostat-gALL
 02690  LC_ALL=C TZ=GMT ./iostat -g total -p ALL 1 2 > tests/out.iostat-gpALL.tmp
-02695  diff -u tests/out.iostat-gpALL.tmp tests/expected.iostat-gpALL
 02696  LC_ALL=C TZ=GMT ./iostat -g other sda9 sda12 -g total -p ALL 1 2 > tests/out2.iostat-gpALL.tmp
-02697  diff -u tests/out2.iostat-gpALL.tmp tests/expected2.iostat-gpALL
 02698  LC_ALL=C TZ=GMT ./iostat -g total -p ALL -g other sda9 sda12 1 2 > tests/out3.iostat-gpALL.tmp
-02699  diff -u tests/out3.iostat-gpALL.tmp tests/expected3.iostat-gpALL
 02700  LC_ALL=C TZ=GMT ./iostat -g total -p sda 1 2 > tests/out.iostat-gp.tmp
-02705  diff -u tests/out.iostat-gp.tmp tests/expected.iostat-gp
 02710  LC_ALL=C TZ=GMT ./iostat -g total -p sda -y 1 3 > tests/out.iostat-gpy.tmp
-02715  diff -u tests/out.iostat-gpy.tmp tests/expected.iostat-gpy
 02720  LC_ALL=C TZ=GMT ./iostat -p cciss/c0d0 1 2 > tests/out.iostat-p-cciss.tmp
-02725  diff -u tests/out.iostat-p-cciss.tmp tests/expected.iostat-p-cciss
 02730  LC_ALL=C TZ=GMT ./iostat cciss/c0d0p1 1 2 > tests/out.iostat-cciss.tmp
-02735  diff -u tests/out.iostat-cciss.tmp tests/expected.iostat-cciss
 02740  LC_ALL=C TZ=GMT ./iostat -o JSON -x -p ALL 1 2 > tests/out.iostat-x-p-ALL-JSON.tmp
-02745  diff -u tests/out.iostat-x-p-ALL-JSON.tmp tests/expected.iostat-x-p-ALL-JSON
 02750  LC_ALL=C TZ=GMT ./iostat -o JSON -dm -g disks sda sdb -g other sdc sdd 1 2 > tests/out.iostat-g-JSON.tmp
-02755  diff -u tests/out.iostat-g-JSON.tmp tests/expected.iostat-g-JSON
 
 =====  iostat: Playing with environment variables
 02800  LC_ALL=C TZ=GMT S_TIME_FORMAT=ISO S_COLORS=never POSIXLY_CORRECT= ./iostat --getenv -d 2 3 > tests/out.iostat-ev.tmp
-02805  diff -u tests/out.iostat-ev.tmp tests/expected.iostat-ev
 
 =====  iostat: Using alternate statistics location
 02900  LC_ALL=C TZ=GMT ./iostat -p ALL 2 2 > tests/out.iostat-alt-pALL.tmp
-02902  diff -u tests/out.iostat-alt-pALL.tmp tests/expected.iostat-alt-pALL
 02905  LC_ALL=C TZ=GMT ./iostat -p ALL -f tests/root/proc 2 2 > tests/out.iostat-f-alt-pALL.tmp
-02907  diff -u tests/out.iostat-f-alt-pALL.tmp tests/expected.iostat-f-alt-pALL
 02910  LC_ALL=C TZ=GMT ./iostat -p ALL +f tests/root/proc 2 2 > tests/out.iostat+f-alt-pALL.tmp
-02912  diff -u tests/out.iostat+f-alt-pALL.tmp tests/expected.iostat+f-alt-pALL
 02920  LC_ALL=C TZ=GMT ./iostat -p ALL -f tests/root/my_stats 2 2 > tests/out.iostat-f-alt-pALL-ms.tmp
-02922  diff -u tests/out.iostat-f-alt-pALL-ms.tmp tests/expected.iostat-f-alt-pALL-ms
+02925  LC_ALL=C TZ=GMT ./iostat -p ALL +f tests/root/my_stats 2 2 > tests/out.iostat+f-alt-pALL-ms.tmp
 02930  LC_ALL=C TZ=GMT ./iostat ALL -f tests/root/my_stats 2 2 > tests/out.iostat-f-alt-ALL-ms.tmp
-02932  diff -u tests/out.iostat-f-alt-ALL-ms.tmp tests/expected.iostat-f-alt-ALL-ms
 02935  LC_ALL=C TZ=GMT ./iostat ALL +f tests/root/my_stats 2 2 > tests/out.iostat+f-alt-ALL-ms.tmp
-02937  diff -u tests/out.iostat+f-alt-ALL-ms.tmp tests/expected.iostat+f-alt-ALL-ms
 02940  LC_ALL=C TZ=GMT ./iostat -f tests/root/my_stats dm-2 sdg -p sda > tests/out.iostat-f-alt-list-ms.tmp
-02942  diff -u tests/out.iostat-f-alt-list-ms.tmp tests/expected.iostat-f-alt-list-ms
 02945  LC_ALL=C TZ=GMT ./iostat +f tests/root/my_stats dm-2 sdg -p sda > tests/out.iostat+f-alt-list-ms.tmp
-02947  diff -u tests/out.iostat+f-alt-list-ms.tmp tests/expected.iostat+f-alt-list-ms
 02950  LC_ALL=C TZ=GMT ./iostat -f tests/root/my_stats sda1 sda13 sdc > tests/out2.iostat-f-alt-list-ms.tmp
-02952  diff -u tests/out2.iostat-f-alt-list-ms.tmp tests/expected2.iostat-f-alt-list-ms
 02955  LC_ALL=C TZ=GMT ./iostat +f tests/root/my_stats sda1 sda13 sdc > tests/out2.iostat+f-alt-list-ms.tmp
-02957  diff -u tests/out2.iostat+f-alt-list-ms.tmp tests/expected2.iostat+f-alt-list-ms
 
 =====  mpstat: Basic tests
 03000  LC_ALL=C TZ=GMT ./mpstat > tests/out.mpstat.tmp
-03002  diff -u tests/out.mpstat.tmp tests/expected.mpstat
 03010  LC_ALL=C TZ=GMT ./mpstat -A 1 2 > tests/out.mpstat-A.tmp
-03012  diff -u tests/out.mpstat-A.tmp tests/expected.mpstat-A
 03020  LC_ALL=C TZ=GMT ./mpstat -A -P 0,3-5 -N all 1 1 > tests/out.mpstat-APN.tmp
-03022  diff -u tests/out.mpstat-APN.tmp tests/expected.mpstat-APN
 03030  LC_ALL=C TZ=GMT ./mpstat -P 0,3-5 -N all,1 -I CPU,SCPU,SUM > tests/out.mpstat-I.tmp
-03032  diff -u tests/out.mpstat-I.tmp tests/expected.mpstat-I
 
 =====  Playing with mpstat
 03040  LC_ALL=C TZ=GMT ./mpstat -I ALL --dec=1 > tests/out.mpstat-dec.tmp
-03042  diff -u tests/out.mpstat-dec.tmp tests/expected.mpstat-dec
 03050  LC_ALL=C TZ=GMT ./mpstat -T -P ALL 1 2 > tests/out.mpstat-T.tmp
-03055  diff -u tests/out.mpstat-T.tmp tests/expected.mpstat-T
 03060  LC_ALL=C TZ=GMT ./mpstat -o JSON -A 1 1 > tests/out.mpstat-A-JSON.tmp
-03065  diff -u tests/out.mpstat-A-JSON.tmp tests/expected.mpstat-A-JSON
 03070  LC_ALL=C TZ=GMT ./mpstat -o JSON -T -P ALL > tests/out.mpstat-T-JSON.tmp
-03075  diff -u tests/out.mpstat-T-JSON.tmp tests/expected.mpstat-T-JSON
 
 =====  Tests mpstat error cases
 03100  LC_ALL=C ./mpstat -1 2>&1 | grep "Usage:" >/dev/null
@@ -535,15 +361,10 @@ NOTES:
 
 =====  tapestat: Basic tests
 04000  LC_ALL=C TZ=GMT ./tapestat > tests/out.tapestat.tmp
-04005  diff -u tests/out.tapestat.tmp tests/expected.tapestat
 04010  LC_ALL=C TZ=GMT ./tapestat -m 1 2 > tests/out.tapestat-m.tmp
-04015  diff -u tests/out.tapestat-m.tmp tests/expected.tapestat-m
 04020  LC_ALL=C TZ=GMT ./tapestat --human -y 1 2 > tests/out.tapestat-y.tmp
-04025  diff -u tests/out.tapestat-y.tmp tests/expected.tapestat-y
 04030  LC_ALL=C TZ=GMT ./tapestat -z 1 2 > tests/out.tapestat-z.tmp
-04035  diff -u tests/out.tapestat-z.tmp tests/expected.tapestat-z
 04040  LC_ALL=C TZ=GMT ./tapestat -t 1 2 > tests/out.tapestat-t.tmp
-04045  diff -u tests/out.tapestat-t.tmp tests/expected.tapestat-t
 
 =====  Tests tapestat error cases
 04100  LC_ALL=C TZ=GMT ./tapestat 1 2 2>&1 | grep "No tape drives" >/dev/null
@@ -555,19 +376,12 @@ NOTES:
 
 =====  cifsiostat: Basic tests
 04500  LC_ALL=C TZ=GMT ./cifsiostat > tests/out.cifsiostat.tmp
-04505  diff -u tests/out.cifsiostat.tmp tests/expected.cifsiostat
 04510  LC_ALL=C TZ=GMT ./cifsiostat -k 1 3 > tests/out.cifsiostat-k.tmp
-04515  diff -u tests/out.cifsiostat-k.tmp tests/expected.cifsiostat-k
 04520  LC_ALL=C TZ=GMT ./cifsiostat -t --human 1 3 > tests/out.cifsiostat-t-human.tmp
-04525  diff -u tests/out.cifsiostat-t-human.tmp tests/expected.cifsiostat-t-human
 04530  LC_ALL=C TZ=GMT ./cifsiostat -h 2 3 > tests/out.cifsiostat-h.tmp
-04535  diff -u tests/out.cifsiostat-h.tmp tests/expected.cifsiostat-h
 04540  LC_ALL=C TZ=GMT ./cifsiostat --dec=0 1 3 > tests/out.cifsiostat-dec.tmp
-04545  diff -u tests/out.cifsiostat-dec.tmp tests/expected.cifsiostat-dec
 04550  LC_ALL=C TZ=GMT ./cifsiostat 1 2 > tests/out.cifsiostat-SMB2.tmp
-04555  diff -u tests/out.cifsiostat-SMB2.tmp tests/expected.cifsiostat-SMB2
 04560  LC_ALL=C TZ=GMT ./cifsiostat --pretty 2 3 > tests/out.cifsiostat-pretty.tmp
-04565  diff -u tests/out.cifsiostat-pretty.tmp tests/expected.cifsiostat-pretty
 
 =====  Test cifsiostat error cases
 04600  LC_ALL=C ./cifsiostat -1 2>&1 | grep "Usage:" >/dev/null
@@ -578,99 +392,52 @@ NOTES:
 
 =====  pidstat: Basic tests
 05000  LC_ALL=C TZ=GMT ./pidstat > tests/out.pidstat.tmp
-05005  diff -u tests/out.pidstat.tmp tests/expected.pidstat
 05010  LC_ALL=C TZ=GMT ./pidstat -dRrsuvw > tests/out.pidstat-A.tmp
-05015  diff -u tests/out.pidstat-A.tmp tests/expected.pidstat-A
 05020  LC_ALL=C TZ=GMT ./pidstat -t -dRrsuvw > tests/out.pidstat-At.tmp
-05025  diff -u tests/out.pidstat-At.tmp tests/expected.pidstat-At
 05030  LC_ALL=C TZ=GMT ./pidstat -dRrsuvw -p ALL > tests/out.pidstat-A-ALL.tmp
-05035  diff -u tests/out.pidstat-A-ALL.tmp tests/expected.pidstat-A-ALL
 05040  LC_ALL=C TZ=GMT ./pidstat -t -dRrsuvw -p ALL > tests/out.pidstat-At-ALL.tmp
-05045  diff -u tests/out.pidstat-At-ALL.tmp tests/expected.pidstat-At-ALL
 05050  LC_ALL=C TZ=GMT ./pidstat -T TASK -dRrsuvw > tests/out.pidstat-A-TTASK.tmp
-05055  diff -u tests/out.pidstat-A-TTASK.tmp tests/expected.pidstat-A-TTASK
 05060  LC_ALL=C TZ=GMT ./pidstat -T TASK -dRrsuvw 2 6 > tests/out1.pidstat-A-TTASK.tmp
-05065  diff -u tests/out.pidstat-A-TTASK-run.tmp tests/expected1.pidstat-A-TTASK
 05070  LC_ALL=C TZ=GMT ./pidstat -T TASK -t -dRrsuvw 2 6 > tests/out1.pidstat-At-TTASK.tmp
-05075  diff -u tests/out1.pidstat-At-TTASK.tmp tests/expected1.pidstat-At-TTASK
 05080  LC_ALL=C TZ=GMT ./pidstat -t -dRrsuvw 2 6 > tests/out1.pidstat-At.tmp
-05085  diff -u tests/out1.pidstat-At.tmp tests/expected1.pidstat-At
 05090  LC_ALL=C TZ=GMT ./pidstat -T TASK -t -dRrsuvw -p ALL 2 6 > tests/out1.pidstat-At-TTASK-ALL.tmp
-05095  diff -u tests/out1.pidstat-At-TTASK-ALL.tmp tests/expected1.pidstat-At-TTASK-ALL
 05100  LC_ALL=C TZ=GMT ./pidstat -T CHILD -dRrsuvw > tests/out.pidstat-A-TCHILD.tmp
-05105  diff -u tests/out.pidstat-A-TCHILD.tmp tests/expected.pidstat-A-TCHILD
 05110  LC_ALL=C TZ=GMT ./pidstat -T CHILD -dRrsuvw 2 6 > tests/out1.pidstat-A-TCHILD.tmp
-05115  diff -u tests/out1.pidstat-A-TCHILD.tmp tests/expected1.pidstat-A-TCHILD
 05120  LC_ALL=C TZ=GMT ./pidstat -T CHILD -t -dRrsuvw 2 6 > tests/out1.pidstat-At-TCHILD.tmp
-05125  diff -u tests/out1.pidstat-At-TCHILD.tmp tests/expected1.pidstat-At-TCHILD
 05130  LC_ALL=C TZ=GMT ./pidstat -T CHILD -t -dRrsuvw -p ALL 2 6 > tests/out1.pidstat-At-TCHILD-ALL.tmp
-05135  diff -u tests/out1.pidstat-At-TCHILD-ALL.tmp tests/expected1.pidstat-At-TCHILD-ALL
 05140  LC_ALL=C TZ=GMT ./pidstat -T ALL -t -dRrsuvw > tests/out.pidstat-At-TALL.tmp
-05145  diff -u tests/out.pidstat-At-TALL.tmp tests/expected.pidstat-At-TALL
 05150  LC_ALL=C TZ=GMT ./pidstat -T ALL -t -dRrsuvw -p ALL 2 6 > tests/out1.pidstat-At-TALL-ALL.tmp
-05155  diff -u tests/out1.pidstat-At-TALL-ALL.tmp tests/expected1.pidstat-At-TALL-ALL
 05160  LC_ALL=C TZ=GMT ./pidstat -T TASK -d 1 3 > tests/out1.pidstat-d-TTASK.tmp
-05165  diff -u tests/out1.pidstat-d-TTASK.tmp tests/expected1.pidstat-d-TTASK
 05170  LC_ALL=C TZ=GMT ./pidstat -T TASK -d -p ALL > tests/out.pidstat-d-TTASK-ALL.tmp
-05175  diff -u tests/out.pidstat-d-TTASK-ALL.tmp tests/expected.pidstat-d-TTASK-ALL
 05180  LC_ALL=C TZ=GMT ./pidstat -uRr -p 1234 1 2 > tests/out.pidstat-p-unkwn.tmp
-05185  diff -u tests/out.pidstat-p-unkwn.tmp tests/expected.pidstat-p-unkwn
 05190  LC_ALL=C TZ=GMT ./pidstat -svw -p 8741,8835 1 2 > tests/out2.pidstat-p-unkwn.tmp
-05195  diff -u tests/out2.pidstat-p-unkwn.tmp tests/expected2.pidstat-p-unkwn
 05200  LC_ALL=C TZ=GMT ./pidstat -ds -p 8741,21342 1 3 > tests/out.pidstat-p.tmp
-05205  diff -u tests/out.pidstat-p.tmp tests/expected.pidstat-p
 05210  LC_ALL=C TZ=GMT ./pidstat -uws -p ALL 1 3 > tests/out1.pidstat-p.tmp
-05215  diff -u tests/out1.pidstat-p.tmp tests/expected1.pidstat-p
 05220  LC_ALL=C TZ=GMT ./pidstat -druws 1 3 > tests/out1.pidstat.tmp
-05225  diff -u tests/out1.pidstat.tmp tests/expected1.pidstat
 05230  LC_ALL=C TZ=GMT ./pidstat -Rw 2 > tests/out.pidstat-sigint.tmp
-05235  diff -u tests/out.pidstat-sigint.tmp tests/expected.pidstat-sigint
 05240  LC_ALL=C TZ=GMT ./pidstat -C foofox 2 6 > tests/out.pidstat-C.tmp
-05245  diff -u tests/out.pidstat-C.tmp tests/expected.pidstat-C
 05250  LC_ALL=C TZ=GMT ./pidstat -C fox 2 6 > tests/out1.pidstat-C.tmp
-05255  diff -u tests/out1.pidstat-C.tmp tests/expected1.pidstat-C
 05260  LC_ALL=C TZ=GMT ./pidstat -C shell -C Web 2 6 > tests/out2.pidstat-C.tmp
-05265  diff -u tests/out2.pidstat-C.tmp tests/expected2.pidstat-C
 05270  LC_ALL=C TZ=GMT ./pidstat -t -C Web 2 6 > tests/out3.pidstat-C.tmp
-05275  diff -u tests/out3.pidstat-C.tmp tests/expected3.pidstat-C
 05280  LC_ALL=C TZ=GMT ./pidstat -t -C "(fox|shell)" 2 6 > tests/out4.pidstat-C.tmp
-05285  diff -u tests/out4.pidstat-C.tmp tests/expected4.pidstat-C
 05290  LC_ALL=C TZ=GMT ./pidstat -t -G foofox 2 6 > tests/out.pidstat-G.tmp
-05295  diff -u tests/out.pidstat-G.tmp tests/expected.pidstat-G
 05300  LC_ALL=C TZ=GMT ./pidstat -G fox 2 6 > tests/out1.pidstat-G.tmp
-05305  diff -u tests/out1.pidstat-G.tmp tests/expected1.pidstat-G
 05310  LC_ALL=C TZ=GMT ./pidstat -t -G fox 2 6 > tests/out2.pidstat-G.tmp
-05315  diff -u tests/out2.pidstat-G.tmp tests/expected2.pidstat-G
 05320  LC_ALL=C TZ=GMT ./pidstat -G fox -p ALL 2 6 > tests/out3.pidstat-G.tmp
-05325  diff -u tests/out3.pidstat-G.tmp tests/expected3.pidstat-G
 05330  LC_ALL=C TZ=GMT ./pidstat -t -G fox -p ALL 2 6 > tests/out4.pidstat-G.tmp
-05335  diff -u tests/out4.pidstat-G.tmp tests/expected4.pidstat-G
 05340  LC_ALL=C TZ=GMT ./pidstat -t -G "^s" -p ALL 2 6 > tests/out5.pidstat-C.tmp
-05345  diff -u tests/out5.pidstat-C.tmp tests/expected5.pidstat-C
 05346  LC_ALL=C TZ=GMT ./pidstat -t -G "terminal-$" -p ALL 2 6 > tests/out6.pidstat-C.tmp
-05347  diff -u tests/out6.pidstat-C.tmp tests/expected6.pidstat-C
 05350  LC_ALL=C TZ=GMT ./pidstat -lt -u -p ALL 2 6 > tests/out.pidstat-l.tmp
-05355  diff -u tests/out.pidstat-l.tmp tests/expected.pidstat-l
 05360  LC_ALL=C TZ=GMT ./pidstat -l -C "browser" 2 6 > tests/out.pidstat-lC.tmp
-05365  diff -u tests/out.pidstat-lC.tmp tests/expected.pidstat-lC
 05370  LC_ALL=C TZ=GMT ./pidstat -lt -G "server$" -p ALL 2 6 > tests/out.pidstat-lG.tmp
-05375  diff -u tests/out.pidstat-lG.tmp tests/expected.pidstat-lG
 05380  LC_ALL=C TZ=GMT ./pidstat -T ALL -t -dRrsuvw --dec=1 > tests/out.pidstat-dec.tmp
-05385  diff -u tests/out.pidstat-dec.tmp tests/expected.pidstat-dec
 05390  LC_ALL=C TZ=GMT ./pidstat -T ALL -t -dRrsuvw -H -h 2 1 > tests/out.pidstat-Hh.tmp
-05395  diff -u tests/out.pidstat-Hh.tmp tests/expected.pidstat-Hh
 05400  LC_ALL=C TZ=GMT ./pidstat -T ALL -dRrsuvw --human -I 2 1 > tests/out.pidstat-I.tmp
-05405  diff -u tests/out.pidstat-I.tmp tests/expected.pidstat-I
 05410  LC_ALL=C TZ=GMT ./pidstat -T CHILD -u -U 2 1 > tests/out.pidstat-U.tmp
-05415  diff -u tests/out.pidstat-U.tmp tests/expected.pidstat-U
 05420  LC_ALL=C TZ=GMT ./pidstat -t -rw -u -U foo 2 1 > tests/out.pidstat-Ufoo.tmp
-05425  diff -u tests/out.pidstat-Ufoo.tmp tests/expected.pidstat-Ufoo
 05430  LC_ALL=C TZ=GMT ./pidstat -t -rw -u -U root 2 1 > tests/out.pidstat-Uroot.tmp
-05435  diff -u tests/out.pidstat-Uroot.tmp tests/expected.pidstat-Uroot
 05440  LC_ALL=C TZ=GMT ./pidstat -t -svwu -p 21342,1234,7900,9009 2 6 > tests/out.pidstat-plist.tmp
-05445  diff -u tests/out.pidstat-plist.tmp tests/expected.pidstat-plist
 05450  LC_ALL=C TZ=GMT ./pidstat 2 6 -t -e sleep 1 > tests/out.pidstat-e.tmp
-05455  diff -u tests/out.pidstat-e.tmp tests/expected.pidstat-e
 
 =====  Tests to be done at the very end
 09900  grep -i FIXME *.c *.h *.in && exit 1 || exit 0
diff --git a/tests/expected.iostat+f-alt-pALL-ms b/tests/expected.iostat+f-alt-pALL-ms
new file mode 100644 (file)
index 0000000..6be775f
--- /dev/null
@@ -0,0 +1,55 @@
+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
+
+Device             tps    kB_read/s    kB_wrtn/s    kB_dscd/s    kB_read    kB_wrtn    kB_dscd
+sda               8.59       222.14        57.08         0.00    1597749     410544          0
+sda1              0.01         0.29         0.00         0.00       2108          0          0
+sda2              0.01         0.29         0.00         0.00       2092          0          0
+sda3              0.01         0.29         0.00         0.00       2100          0          0
+sda4              0.00         0.00         0.00         0.00         14          0          0
+sda5              0.01         0.31         0.00         0.00       2252          0          0
+sda6              0.02         0.62         0.00         0.00       4424         12          0
+sda7              0.02         0.62         0.00         0.00       4437         12          0
+sda8              0.01         0.34         0.00         0.00       2444          0          0
+sda9              6.60       193.17        19.89         0.00    1389369     143040          0
+sda10             0.01         0.31         0.00         0.00       2220          0          0
+sda11             0.01         0.31         0.00         0.00       2252          0          0
+sda12             1.88        25.28        37.19         0.00     181825     267480          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
+sdb               0.01         0.29         0.00         0.00       2108          0          0
+sde               0.00         0.00         0.00         0.00          0          0          0
+sdc               0.00         0.00         0.00         0.00          0          0          0
+sdd               0.00         0.00         0.00         0.00          0          0          0
+dm-2              0.00         0.00         0.00         0.00          0          0          0
+sdf               0.01         0.29         0.00         0.00       2092          0          0
+sdg               0.02         0.62         0.00         0.00       4424         12          0
+
+
+avg-cpu:  %user   %nice %system %iowait  %steal   %idle
+           2.15   12.50    2.35    0.12    0.00   82.89
+
+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
+sda1              0.00         0.00         0.00         0.00          0          0          0
+sda2              0.00         0.00         0.00         0.00          0          0          0
+sda3              0.00         0.00         0.00         0.00          0          0          0
+sda4              0.00         0.00         0.00         0.00          0          0          0
+sda5              0.00         0.00         0.00         0.00          0          0          0
+sda6              0.00         0.00         0.00         0.00          0          0          0
+sda7              0.00         0.00         0.00         0.00          0          0          0
+sda8              0.00         0.00         0.00         0.00          0          0          0
+sda9              0.00         0.00         0.00         0.00          0          0          0
+sda10             0.00         0.00         0.00         0.00          0          0          0
+sda11             0.00         0.00         0.00         0.00          0          0          0
+sda12             0.00         0.00         0.00         0.00          0          0          0
+sr0               0.00         0.00         0.00         0.00          0          0          0
+sdb               0.00         0.00         0.00         0.00          0          0          0
+sde               0.00         0.00         0.00         0.00          0          0          0
+sdc               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.67        16.04         0.16         0.00        500          5          0
+
+