Add new non regression tests

Test the use of option -j with filesystem statistics.

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

diff --git a/tests/00902 b/tests/00902
new file mode 100644 (file)
index 0000000..206db8f
--- /dev/null
+++ b/tests/00902
@@ -0,0 +1,3 @@
+rm -f tests/root
+ln -s root1 tests/root
+LC_ALL=C TZ=GMT ./sar -F MOUNT -j UUID -f tests/data.tmp > tests/out.sar-FMOUNT-jUUID.tmp && diff -u tests/expected.sar-FMOUNT-jUUID tests/out.sar-FMOUNT-jUUID.tmp

diff --git a/tests/00908 b/tests/00908
new file mode 100644 (file)
index 0000000..d7be8ee
--- /dev/null
+++ b/tests/00908
@@ -0,0 +1,3 @@
+rm -f tests/root
+ln -s root1 tests/root
+LC_ALL=C TZ=GMT ./sar -F -j UUID -f tests/data.tmp > tests/out.sar-F-jUUID.tmp && diff -u tests/expected.sar-F-jUUID tests/out.sar-F-jUUID.tmp

diff --git a/tests/TLIST b/tests/TLIST
index 18c42549b263b4830f15cddd1f66f0cf81085119..3922c4a3bea107106054445c16a23955faa0b94d 100644 (file)
--- a/tests/TLIST
+++ b/tests/TLIST
@@ -132,9 +132,11 @@ NOTES:
 00870  LC_ALL=C TZ=GMT ./sar 60 -uw -P ALL -f tests/data.tmp > tests/out2.sar-i.tmp
 00880  LC_ALL=C TZ=GMT ./sar 60 2 -f tests/data.tmp > tests/out3.sar-i.tmp
 00900  LC_ALL=C TZ=GMT ./sar -dh -j UUID -f tests/data.tmp > tests/out.sar-jUUID.tmp
+00902  LC_ALL=C TZ=GMT ./sar -F MOUNT -j UUID -f tests/data.tmp > tests/out.sar-FMOUNT-jUUID.tmp
 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]
 00906  LC_ALL=C TZ=GMT ./sar -dh -j SID -f tests/data.tmp > tests/out.sar-jSID.tmp
+00908  LC_ALL=C TZ=GMT ./sar -F -j UUID -f tests/data.tmp > tests/out.sar-F-jUUID.tmp
 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)]

diff --git a/tests/expected.sar-F-jUUID b/tests/expected.sar-F-jUUID
new file mode 100644 (file)
index 0000000..2a29126
--- /dev/null
+++ b/tests/expected.sar-F-jUUID
@@ -0,0 +1,43 @@
+Linux 1.2.3-TEST (SYSSTAT.TEST)        04/18/19        _x86_64_        (9 CPU)
+
+13:20:09     MBfsfree  MBfsused   %fsused  %ufsused     Ifree     Iused    %Iused FILESYSTEM
+13:20:19        85582      7774      8.33     13.45   6008414    102818      1.68 fe9a021c-3148-41f7-a04b-97442a7eae73
+13:20:19       279061     16103      5.46     10.54  19051710    150338      0.78 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc
+13:20:19        85582      7774      8.33     13.45   6008414    102818      1.68 43a1c948-8c32-46b8-bb97-c8d58facb27a
+13:20:19       279700     15464      5.24     10.33  19201593       455      0.00 25b1e232-0d3c-4742-82b6-927b2a091f1b
+13:20:29        11154     18247     62.06     67.22   1621550    299810     15.60 fe9a021c-3148-41f7-a04b-97442a7eae73
+13:20:29       279061     16103      5.46     10.54  19051710    150338      0.78 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc
+13:20:29        85582      7774      8.33     13.45   6008414    102818      1.68 43a1c948-8c32-46b8-bb97-c8d58facb27a
+13:20:29       279700     15464      5.24     10.33  19201593       455      0.00 25b1e232-0d3c-4742-82b6-927b2a091f1b
+13:20:29        11154     18247     62.06     67.22   1621550    299810     15.60 /dev/sdf
+13:20:29       279061     16103      5.46     10.54  19051710    150338      0.78 /dev/sdg
+13:20:39        11154     18247     62.06     67.22   1621550    299810     15.60 fe9a021c-3148-41f7-a04b-97442a7eae73
+13:20:39       279061     16103      5.46     10.54  19051710    150338      0.78 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc
+13:20:39        85582      7774      8.33     13.45   6008414    102818      1.68 43a1c948-8c32-46b8-bb97-c8d58facb27a
+13:20:39       279700     15464      5.24     10.33  19201593       455      0.00 25b1e232-0d3c-4742-82b6-927b2a091f1b
+13:20:39        11154     18247     62.06     67.22   1621550    299810     15.60 /dev/sdf
+13:20:39       279061     16103      5.46     10.54  19051710    150338      0.78 /dev/sdg
+13:20:49        85582      7774      8.33     13.45   6008414    102818      1.68 fe9a021c-3148-41f7-a04b-97442a7eae73
+13:20:49       279700     15464      5.24     10.33  19201593       455      0.00 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc
+13:20:49        11154     18247     62.06     67.22   1621550    299810     15.60 43a1c948-8c32-46b8-bb97-c8d58facb27a
+13:20:49       279061     16103      5.46     10.54  19051710    150338      0.78 25b1e232-0d3c-4742-82b6-927b2a091f1b
+Summary:        85582      7774      8.33     13.45   6008414    102818      1.68 fe9a021c-3148-41f7-a04b-97442a7eae73
+Summary:       279700     15464      5.24     10.33  19201593       455      0.00 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc
+Summary:        11154     18247     62.06     67.22   1621550    299810     15.60 43a1c948-8c32-46b8-bb97-c8d58facb27a
+Summary:       279061     16103      5.46     10.54  19051710    150338      0.78 25b1e232-0d3c-4742-82b6-927b2a091f1b
+Summary:        11154     18247     62.06     67.22   1621550    299810     15.60 /dev/sdf
+Summary:       279061     16103      5.46     10.54  19051710    150338      0.78 /dev/sdg
+
+13:37:29     LINUX RESTART     (9 CPU)
+
+13:54:09     LINUX RESTART     (10 CPU)
+
+13:54:15     MBfsfree  MBfsused   %fsused  %ufsused     Ifree     Iused    %Iused FILESYSTEM
+13:54:35        85582      7774      8.33     13.45   6008414    102818      1.68 fe9a021c-3148-41f7-a04b-97442a7eae73
+13:54:35       279700     15464      5.24     10.33  19201593       455      0.00 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc
+13:54:35        11154     18247     62.06     67.22   1621550    299810     15.60 43a1c948-8c32-46b8-bb97-c8d58facb27a
+13:54:35       279061     16103      5.46     10.54  19051710    150338      0.78 25b1e232-0d3c-4742-82b6-927b2a091f1b
+Summary:        85582      7774      8.33     13.45   6008414    102818      1.68 fe9a021c-3148-41f7-a04b-97442a7eae73
+Summary:       279700     15464      5.24     10.33  19201593       455      0.00 32fae3c4-8ea2-4e9b-9753-7fdbbbaef4fc
+Summary:        11154     18247     62.06     67.22   1621550    299810     15.60 43a1c948-8c32-46b8-bb97-c8d58facb27a
+Summary:       279061     16103      5.46     10.54  19051710    150338      0.78 25b1e232-0d3c-4742-82b6-927b2a091f1b

diff --git a/tests/expected.sar-FMOUNT-jUUID b/tests/expected.sar-FMOUNT-jUUID
new file mode 100644 (file)
index 0000000..50fae51
--- /dev/null
+++ b/tests/expected.sar-FMOUNT-jUUID
@@ -0,0 +1,43 @@
+Linux 1.2.3-TEST (SYSSTAT.TEST)        04/18/19        _x86_64_        (9 CPU)
+
+13:20:09     MBfsfree  MBfsused   %fsused  %ufsused     Ifree     Iused    %Iused MOUNTPOINT
+13:20:19        85582      7774      8.33     13.45   6008414    102818      1.68 /
+13:20:19       279061     16103      5.46     10.54  19051710    150338      0.78 /opt
+13:20:19        85582      7774      8.33     13.45   6008414    102818      1.68 /home
+13:20:19       279700     15464      5.24     10.33  19201593       455      0.00 /data
+13:20:29        11154     18247     62.06     67.22   1621550    299810     15.60 /
+13:20:29       279061     16103      5.46     10.54  19051710    150338      0.78 /opt
+13:20:29        85582      7774      8.33     13.45   6008414    102818      1.68 /home
+13:20:29       279700     15464      5.24     10.33  19201593       455      0.00 /data
+13:20:29        11154     18247     62.06     67.22   1621550    299810     15.60 /foo
+13:20:29       279061     16103      5.46     10.54  19051710    150338      0.78 /bar
+13:20:39        11154     18247     62.06     67.22   1621550    299810     15.60 /
+13:20:39       279061     16103      5.46     10.54  19051710    150338      0.78 /opt
+13:20:39        85582      7774      8.33     13.45   6008414    102818      1.68 /home
+13:20:39       279700     15464      5.24     10.33  19201593       455      0.00 /data
+13:20:39        11154     18247     62.06     67.22   1621550    299810     15.60 /foo
+13:20:39       279061     16103      5.46     10.54  19051710    150338      0.78 /bar
+13:20:49        85582      7774      8.33     13.45   6008414    102818      1.68 /
+13:20:49       279700     15464      5.24     10.33  19201593       455      0.00 /opt
+13:20:49        11154     18247     62.06     67.22   1621550    299810     15.60 /home
+13:20:49       279061     16103      5.46     10.54  19051710    150338      0.78 /data
+Summary:        85582      7774      8.33     13.45   6008414    102818      1.68 /
+Summary:       279700     15464      5.24     10.33  19201593       455      0.00 /opt
+Summary:        11154     18247     62.06     67.22   1621550    299810     15.60 /home
+Summary:       279061     16103      5.46     10.54  19051710    150338      0.78 /data
+Summary:        11154     18247     62.06     67.22   1621550    299810     15.60 /foo
+Summary:       279061     16103      5.46     10.54  19051710    150338      0.78 /bar
+
+13:37:29     LINUX RESTART     (9 CPU)
+
+13:54:09     LINUX RESTART     (10 CPU)
+
+13:54:15     MBfsfree  MBfsused   %fsused  %ufsused     Ifree     Iused    %Iused MOUNTPOINT
+13:54:35        85582      7774      8.33     13.45   6008414    102818      1.68 /
+13:54:35       279700     15464      5.24     10.33  19201593       455      0.00 /opt
+13:54:35        11154     18247     62.06     67.22   1621550    299810     15.60 /home
+13:54:35       279061     16103      5.46     10.54  19051710    150338      0.78 /data
+Summary:        85582      7774      8.33     13.45   6008414    102818      1.68 /
+Summary:       279700     15464      5.24     10.33  19201593       455      0.00 /opt
+Summary:        11154     18247     62.06     67.22   1621550    299810     15.60 /home
+Summary:       279061     16103      5.46     10.54  19051710    150338      0.78 /data