diff options
Diffstat (limited to 'tests')
142 files changed, 1502 insertions, 54 deletions
diff --git a/tests/expected/blkid/low-probe-bluestore b/tests/expected/blkid/low-probe-bluestore new file mode 100644 index 000000000..006d4022b --- /dev/null +++ b/tests/expected/blkid/low-probe-bluestore @@ -0,0 +1,2 @@ +ID_FS_TYPE=ceph_bluestore +ID_FS_USAGE=other diff --git a/tests/expected/blkid/low-probe-drbd-v08 b/tests/expected/blkid/low-probe-drbd-v08 new file mode 100644 index 000000000..22b431320 --- /dev/null +++ b/tests/expected/blkid/low-probe-drbd-v08 @@ -0,0 +1,5 @@ +ID_FS_TYPE=drbd +ID_FS_USAGE=raid +ID_FS_UUID=4242424242424242 +ID_FS_UUID_ENC=4242424242424242 +ID_FS_VERSION=v08 diff --git a/tests/expected/blkid/low-probe-drbd-v09 b/tests/expected/blkid/low-probe-drbd-v09 new file mode 100644 index 000000000..0bf0dcfb9 --- /dev/null +++ b/tests/expected/blkid/low-probe-drbd-v09 @@ -0,0 +1,5 @@ +ID_FS_TYPE=drbd +ID_FS_USAGE=raid +ID_FS_UUID=4242424242424242 +ID_FS_UUID_ENC=4242424242424242 +ID_FS_VERSION=v09 diff --git a/tests/expected/blkid/low-probe-udf-bdr-2.60-nero b/tests/expected/blkid/low-probe-udf-bdr-2.60-nero new file mode 100644 index 000000000..c0b8867b5 --- /dev/null +++ b/tests/expected/blkid/low-probe-udf-bdr-2.60-nero @@ -0,0 +1,10 @@ +ID_FS_LABEL=Label +ID_FS_LABEL_ENC=Label +ID_FS_LOGICAL_VOLUME_ID=Label +ID_FS_TYPE=udf +ID_FS_USAGE=filesystem +ID_FS_UUID=3b4a858dc4b57a72 +ID_FS_UUID_ENC=3b4a858dc4b57a72 +ID_FS_VERSION=2.60 +ID_FS_VOLUME_ID=Label +ID_FS_VOLUME_SET_ID=3B4A858DC4B57A72 diff --git a/tests/expected/blkid/md-raid0-whole b/tests/expected/blkid/md-raid0-whole index 91ecba059..340cf5378 100644 --- a/tests/expected/blkid/md-raid0-whole +++ b/tests/expected/blkid/md-raid0-whole @@ -12,13 +12,13 @@ Created a new <removed>. Command (m for help): Partition type p primary (0 primary, 0 extended, 4 free) e extended (container for logical partitions) -Select (default p): Partition number (1-4, default 1): First sector (2048-204543, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-204543, default 204543): +Select (default p): Partition number (1-4, default 1): First sector (2048-204543, default 2048): Last sector, +/-sectors or +/-size{K,M,G,T,P} (2048-204543, default 204543): Created a new <removed>. Command (m for help): Partition type p primary (1 primary, 0 extended, 3 free) e extended (container for logical partitions) -Select (default p): Partition number (2-4, default 2): First sector (22528-204543, default 22528): Last sector, +sectors or +size{K,M,G,T,P} (22528-204543, default 204543): +Select (default p): Partition number (2-4, default 2): First sector (22528-204543, default 22528): Last sector, +/-sectors or +/-size{K,M,G,T,P} (22528-204543, default 204543): Created a new <removed>. Command (m for help): Disk <removed>: 99.9 MiB, 104726528 bytes, 204544 sectors diff --git a/tests/expected/blkid/md-raid1-part b/tests/expected/blkid/md-raid1-part index 781c65c90..b568edbd1 100644 --- a/tests/expected/blkid/md-raid1-part +++ b/tests/expected/blkid/md-raid1-part @@ -10,16 +10,17 @@ Created a new <removed>. Command (m for help): Partition type p primary (0 primary, 0 extended, 4 free) e extended (container for logical partitions) -Select (default p): Partition number (1-4, default 1): First sector (2048-104447, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-104447, default 104447): +Select (default p): Partition number (1-4, default 1): First sector (2048-104447, default 2048): Last sector, +/-sectors or +/-size{K,M,G,T,P} (2048-104447, default 104447): Created a new <removed>. Command (m for help): Partition type p primary (1 primary, 0 extended, 3 free) e extended (container for logical partitions) -Select (default p): Partition number (2-4, default 2): First sector (53248-104447, default 53248): Last sector, +sectors or +size{K,M,G,T,P} (53248-104447, default 104447): +Select (default p): Partition number (2-4, default 2): First sector (53248-104447, default 53248): Last sector, +/-sectors or +/-size{K,M,G,T,P} (53248-104447, default 104447): Created a new <removed>. Command (m for help): Disk <removed>: 51 MiB, 53477376 bytes, 104448 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/blkid/md-raid1-whole b/tests/expected/blkid/md-raid1-whole index ae5a95ddb..0a63dc743 100644 --- a/tests/expected/blkid/md-raid1-whole +++ b/tests/expected/blkid/md-raid1-whole @@ -12,13 +12,13 @@ Created a new <removed>. Command (m for help): Partition type p primary (0 primary, 0 extended, 4 free) e extended (container for logical partitions) -Select (default p): Partition number (1-4, default 1): First sector (2048-102271, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-102271, default 102271): +Select (default p): Partition number (1-4, default 1): First sector (2048-102271, default 2048): Last sector, +/-sectors or +/-size{K,M,G,T,P} (2048-102271, default 102271): Created a new <removed>. Command (m for help): Partition type p primary (1 primary, 0 extended, 3 free) e extended (container for logical partitions) -Select (default p): Partition number (2-4, default 2): First sector (22528-102271, default 22528): Last sector, +sectors or +size{K,M,G,T,P} (22528-102271, default 102271): +Select (default p): Partition number (2-4, default 2): First sector (22528-102271, default 22528): Last sector, +/-sectors or +/-size{K,M,G,T,P} (22528-102271, default 102271): Created a new <removed>. Command (m for help): Disk /dev/md8: 50 MiB, 52363264 bytes, 102272 sectors diff --git a/tests/expected/build-sys/config-all b/tests/expected/build-sys/config-all index e92d670b1..b3e2f1f0f 100644 --- a/tests/expected/build-sys/config-all +++ b/tests/expected/build-sys/config-all @@ -48,6 +48,7 @@ cal: libtinfo chcpu: chfn: libpam libpam_misc libpthread libreadline libuser chmem: +choom: chrt: chsh: libpam libpam_misc libpthread libreadline libuser col: diff --git a/tests/expected/build-sys/config-all-non-nls b/tests/expected/build-sys/config-all-non-nls index e92d670b1..b3e2f1f0f 100644 --- a/tests/expected/build-sys/config-all-non-nls +++ b/tests/expected/build-sys/config-all-non-nls @@ -48,6 +48,7 @@ cal: libtinfo chcpu: chfn: libpam libpam_misc libpthread libreadline libuser chmem: +choom: chrt: chsh: libpam libpam_misc libpthread libreadline libuser col: diff --git a/tests/expected/build-sys/config-audit b/tests/expected/build-sys/config-audit index bc84cff47..ab99871af 100644 --- a/tests/expected/build-sys/config-audit +++ b/tests/expected/build-sys/config-audit @@ -48,6 +48,7 @@ cal: libtinfo chcpu: chfn: libpam libpam_misc libpthread libreadline libuser chmem: +choom: chrt: chsh: libpam libpam_misc libpthread libreadline libuser col: diff --git a/tests/expected/build-sys/config-chfnsh-libuser b/tests/expected/build-sys/config-chfnsh-libuser index b4fbb6e28..5e0c52bd8 100644 --- a/tests/expected/build-sys/config-chfnsh-libuser +++ b/tests/expected/build-sys/config-chfnsh-libuser @@ -48,6 +48,7 @@ cal: libtinfo chcpu: chfn: libpam libpam_misc libpthread libreadline libselinux libuser chmem: +choom: chrt: chsh: libpam libpam_misc libpthread libreadline libselinux libuser col: diff --git a/tests/expected/build-sys/config-chfnsh-no-password b/tests/expected/build-sys/config-chfnsh-no-password index ef81f8c91..3b604b963 100644 --- a/tests/expected/build-sys/config-chfnsh-no-password +++ b/tests/expected/build-sys/config-chfnsh-no-password @@ -48,6 +48,7 @@ cal: libtinfo chcpu: chfn: libreadline libselinux chmem: +choom: chrt: chsh: libreadline libselinux col: diff --git a/tests/expected/build-sys/config-chfnsh-pam b/tests/expected/build-sys/config-chfnsh-pam index eebfdca9a..b5ef6587a 100644 --- a/tests/expected/build-sys/config-chfnsh-pam +++ b/tests/expected/build-sys/config-chfnsh-pam @@ -48,6 +48,7 @@ cal: libtinfo chcpu: chfn: libpam libpam_misc libreadline libselinux chmem: +choom: chrt: chsh: libpam libpam_misc libreadline libselinux col: diff --git a/tests/expected/build-sys/config-core b/tests/expected/build-sys/config-core index 99b30ac8d..c2c32cc0f 100644 --- a/tests/expected/build-sys/config-core +++ b/tests/expected/build-sys/config-core @@ -48,6 +48,7 @@ cal: libtinfo chcpu: chfn: libpam libpam_misc libpthread libreadline libuser chmem: +choom: chrt: chsh: libpam libpam_misc libpthread libreadline libuser col: diff --git a/tests/expected/build-sys/config-devel b/tests/expected/build-sys/config-devel index e7228f979..b1dd90b7b 100644 --- a/tests/expected/build-sys/config-devel +++ b/tests/expected/build-sys/config-devel @@ -48,6 +48,7 @@ cal: libtinfo chcpu: chfn: libpam libpam_misc libpthread libreadline libselinux libuser chmem: +choom: chrt: chsh: libpam libpam_misc libpthread libreadline libselinux libuser col: diff --git a/tests/expected/build-sys/config-devel-non-docs b/tests/expected/build-sys/config-devel-non-docs index e7228f979..b1dd90b7b 100644 --- a/tests/expected/build-sys/config-devel-non-docs +++ b/tests/expected/build-sys/config-devel-non-docs @@ -48,6 +48,7 @@ cal: libtinfo chcpu: chfn: libpam libpam_misc libpthread libreadline libselinux libuser chmem: +choom: chrt: chsh: libpam libpam_misc libpthread libreadline libselinux libuser col: diff --git a/tests/expected/build-sys/config-non-libblkid b/tests/expected/build-sys/config-non-libblkid index 2e528e9b9..a3a451d19 100644 --- a/tests/expected/build-sys/config-non-libblkid +++ b/tests/expected/build-sys/config-non-libblkid @@ -27,6 +27,7 @@ cal: libtinfo chcpu: chfn: libpam libpam_misc libpthread libreadline libuser chmem: +choom: chrt: chsh: libpam libpam_misc libpthread libreadline libuser col: diff --git a/tests/expected/build-sys/config-non-libmount b/tests/expected/build-sys/config-non-libmount index 036c68f32..931336525 100644 --- a/tests/expected/build-sys/config-non-libmount +++ b/tests/expected/build-sys/config-non-libmount @@ -34,6 +34,7 @@ cal: libtinfo chcpu: chfn: libpam libpam_misc libpthread libreadline libuser chmem: +choom: chrt: chsh: libpam libpam_misc libpthread libreadline libuser col: diff --git a/tests/expected/build-sys/config-non-libs b/tests/expected/build-sys/config-non-libs index 0cf8aeef6..c445ab00a 100644 --- a/tests/expected/build-sys/config-non-libs +++ b/tests/expected/build-sys/config-non-libs @@ -6,6 +6,7 @@ cal: libtinfo chcpu: chfn: libpam libpam_misc libpthread libreadline libuser chmem: +choom: chrt: chsh: libpam libpam_misc libpthread libreadline libuser col: diff --git a/tests/expected/build-sys/config-non-libsmartcols b/tests/expected/build-sys/config-non-libsmartcols index 28e7a229d..576d796db 100644 --- a/tests/expected/build-sys/config-non-libsmartcols +++ b/tests/expected/build-sys/config-non-libsmartcols @@ -23,6 +23,7 @@ cal: libtinfo chcpu: chfn: libpam libpam_misc libpthread libreadline libuser chmem: +choom: chrt: chsh: libpam libpam_misc libpthread libreadline libuser col: diff --git a/tests/expected/build-sys/config-non-libuuid b/tests/expected/build-sys/config-non-libuuid index de6bb38c6..60a200c3a 100644 --- a/tests/expected/build-sys/config-non-libuuid +++ b/tests/expected/build-sys/config-non-libuuid @@ -40,6 +40,7 @@ cal: libtinfo chcpu: chfn: libpam libpam_misc libpthread libreadline libuser chmem: +choom: chrt: chsh: libpam libpam_misc libpthread libreadline libuser col: diff --git a/tests/expected/build-sys/config-non-nls b/tests/expected/build-sys/config-non-nls index 99b30ac8d..c2c32cc0f 100644 --- a/tests/expected/build-sys/config-non-nls +++ b/tests/expected/build-sys/config-non-nls @@ -48,6 +48,7 @@ cal: libtinfo chcpu: chfn: libpam libpam_misc libpthread libreadline libuser chmem: +choom: chrt: chsh: libpam libpam_misc libpthread libreadline libuser col: diff --git a/tests/expected/build-sys/config-selinux b/tests/expected/build-sys/config-selinux index ddb508f25..aab84f37e 100644 --- a/tests/expected/build-sys/config-selinux +++ b/tests/expected/build-sys/config-selinux @@ -48,6 +48,7 @@ cal: libtinfo chcpu: chfn: libpam libpam_misc libpthread libreadline libselinux libuser chmem: +choom: chrt: chsh: libpam libpam_misc libpthread libreadline libselinux libuser col: diff --git a/tests/expected/build-sys/config-slang b/tests/expected/build-sys/config-slang index 2c7e8a79c..7de180226 100644 --- a/tests/expected/build-sys/config-slang +++ b/tests/expected/build-sys/config-slang @@ -48,6 +48,7 @@ cal: libtinfo chcpu: chfn: libpam libpam_misc libpthread libreadline libuser chmem: +choom: chrt: chsh: libpam libpam_misc libpthread libreadline libuser col: diff --git a/tests/expected/build-sys/config-static b/tests/expected/build-sys/config-static index 405c8494b..1e35f2b5f 100644 --- a/tests/expected/build-sys/config-static +++ b/tests/expected/build-sys/config-static @@ -49,6 +49,7 @@ cal: libtinfo chcpu: chfn: libpam libpam_misc libpthread libreadline libuser chmem: +choom: chrt: chsh: libpam libpam_misc libpthread libreadline libuser col: diff --git a/tests/expected/cal/month-Sn201 b/tests/expected/cal/month-Sn201 new file mode 100644 index 000000000..4374b9590 --- /dev/null +++ b/tests/expected/cal/month-Sn201 @@ -0,0 +1,537 @@ +Extreme span + May 1998 June 1998 July 1998 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 1 2 3 4 5 6 1 2 3 4 + 3 4 5 6 7 8 9 7 8 9 10 11 12 13 5 6 7 8 9 10 11 +10 11 12 13 14 15 16 14 15 16 17 18 19 20 12 13 14 15 16 17 18 +17 18 19 20 21 22 23 21 22 23 24 25 26 27 19 20 21 22 23 24 25 +24 25 26 27 28 29 30 28 29 30 26 27 28 29 30 31 +31 + August 1998 September 1998 October 1998 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 1 2 3 4 5 1 2 3 + 2 3 4 5 6 7 8 6 7 8 9 10 11 12 4 5 6 7 8 9 10 + 9 10 11 12 13 14 15 13 14 15 16 17 18 19 11 12 13 14 15 16 17 +16 17 18 19 20 21 22 20 21 22 23 24 25 26 18 19 20 21 22 23 24 +23 24 25 26 27 28 29 27 28 29 30 25 26 27 28 29 30 31 +30 31 + November 1998 December 1998 January 1999 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 7 1 2 3 4 5 1 2 + 8 9 10 11 12 13 14 6 7 8 9 10 11 12 3 4 5 6 7 8 9 +15 16 17 18 19 20 21 13 14 15 16 17 18 19 10 11 12 13 14 15 16 +22 23 24 25 26 27 28 20 21 22 23 24 25 26 17 18 19 20 21 22 23 +29 30 27 28 29 30 31 24 25 26 27 28 29 30 + 31 + February 1999 March 1999 April 1999 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 1 2 3 4 5 6 1 2 3 + 7 8 9 10 11 12 13 7 8 9 10 11 12 13 4 5 6 7 8 9 10 +14 15 16 17 18 19 20 14 15 16 17 18 19 20 11 12 13 14 15 16 17 +21 22 23 24 25 26 27 21 22 23 24 25 26 27 18 19 20 21 22 23 24 +28 28 29 30 31 25 26 27 28 29 30 + + May 1999 June 1999 July 1999 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 1 2 3 4 5 1 2 3 + 2 3 4 5 6 7 8 6 7 8 9 10 11 12 4 5 6 7 8 9 10 + 9 10 11 12 13 14 15 13 14 15 16 17 18 19 11 12 13 14 15 16 17 +16 17 18 19 20 21 22 20 21 22 23 24 25 26 18 19 20 21 22 23 24 +23 24 25 26 27 28 29 27 28 29 30 25 26 27 28 29 30 31 +30 31 + August 1999 September 1999 October 1999 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 7 1 2 3 4 1 2 + 8 9 10 11 12 13 14 5 6 7 8 9 10 11 3 4 5 6 7 8 9 +15 16 17 18 19 20 21 12 13 14 15 16 17 18 10 11 12 13 14 15 16 +22 23 24 25 26 27 28 19 20 21 22 23 24 25 17 18 19 20 21 22 23 +29 30 31 26 27 28 29 30 24 25 26 27 28 29 30 + 31 + November 1999 December 1999 January 2000 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 1 2 3 4 1 + 7 8 9 10 11 12 13 5 6 7 8 9 10 11 2 3 4 5 6 7 8 +14 15 16 17 18 19 20 12 13 14 15 16 17 18 9 10 11 12 13 14 15 +21 22 23 24 25 26 27 19 20 21 22 23 24 25 16 17 18 19 20 21 22 +28 29 30 26 27 28 29 30 31 23 24 25 26 27 28 29 + 30 31 + February 2000 March 2000 April 2000 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 1 2 3 4 1 + 6 7 8 9 10 11 12 5 6 7 8 9 10 11 2 3 4 5 6 7 8 +13 14 15 16 17 18 19 12 13 14 15 16 17 18 9 10 11 12 13 14 15 +20 21 22 23 24 25 26 19 20 21 22 23 24 25 16 17 18 19 20 21 22 +27 28 29 26 27 28 29 30 31 23 24 25 26 27 28 29 + 30 + May 2000 June 2000 July 2000 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 1 2 3 1 + 7 8 9 10 11 12 13 4 5 6 7 8 9 10 2 3 4 5 6 7 8 +14 15 16 17 18 19 20 11 12 13 14 15 16 17 9 10 11 12 13 14 15 +21 22 23 24 25 26 27 18 19 20 21 22 23 24 16 17 18 19 20 21 22 +28 29 30 31 25 26 27 28 29 30 23 24 25 26 27 28 29 + 30 31 + August 2000 September 2000 October 2000 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 1 2 1 2 3 4 5 6 7 + 6 7 8 9 10 11 12 3 4 5 6 7 8 9 8 9 10 11 12 13 14 +13 14 15 16 17 18 19 10 11 12 13 14 15 16 15 16 17 18 19 20 21 +20 21 22 23 24 25 26 17 18 19 20 21 22 23 22 23 24 25 26 27 28 +27 28 29 30 31 24 25 26 27 28 29 30 29 30 31 + + November 2000 December 2000 January 2001 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 1 2 1 2 3 4 5 6 + 5 6 7 8 9 10 11 3 4 5 6 7 8 9 7 8 9 10 11 12 13 +12 13 14 15 16 17 18 10 11 12 13 14 15 16 14 15 16 17 18 19 20 +19 20 21 22 23 24 25 17 18 19 20 21 22 23 21 22 23 24 25 26 27 +26 27 28 29 30 24 25 26 27 28 29 30 28 29 30 31 + 31 + February 2001 March 2001 April 2001 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 1 2 3 1 2 3 4 5 6 7 + 4 5 6 7 8 9 10 4 5 6 7 8 9 10 8 9 10 11 12 13 14 +11 12 13 14 15 16 17 11 12 13 14 15 16 17 15 16 17 18 19 20 21 +18 19 20 21 22 23 24 18 19 20 21 22 23 24 22 23 24 25 26 27 28 +25 26 27 28 25 26 27 28 29 30 31 29 30 + + May 2001 June 2001 July 2001 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 1 2 1 2 3 4 5 6 7 + 6 7 8 9 10 11 12 3 4 5 6 7 8 9 8 9 10 11 12 13 14 +13 14 15 16 17 18 19 10 11 12 13 14 15 16 15 16 17 18 19 20 21 +20 21 22 23 24 25 26 17 18 19 20 21 22 23 22 23 24 25 26 27 28 +27 28 29 30 31 24 25 26 27 28 29 30 29 30 31 + + August 2001 September 2001 October 2001 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 1 1 2 3 4 5 6 + 5 6 7 8 9 10 11 2 3 4 5 6 7 8 7 8 9 10 11 12 13 +12 13 14 15 16 17 18 9 10 11 12 13 14 15 14 15 16 17 18 19 20 +19 20 21 22 23 24 25 16 17 18 19 20 21 22 21 22 23 24 25 26 27 +26 27 28 29 30 31 23 24 25 26 27 28 29 28 29 30 31 + 30 + November 2001 December 2001 January 2002 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 1 1 2 3 4 5 + 4 5 6 7 8 9 10 2 3 4 5 6 7 8 6 7 8 9 10 11 12 +11 12 13 14 15 16 17 9 10 11 12 13 14 15 13 14 15 16 17 18 19 +18 19 20 21 22 23 24 16 17 18 19 20 21 22 20 21 22 23 24 25 26 +25 26 27 28 29 30 23 24 25 26 27 28 29 27 28 29 30 31 + 30 31 + February 2002 March 2002 April 2002 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 1 2 1 2 3 4 5 6 + 3 4 5 6 7 8 9 3 4 5 6 7 8 9 7 8 9 10 11 12 13 +10 11 12 13 14 15 16 10 11 12 13 14 15 16 14 15 16 17 18 19 20 +17 18 19 20 21 22 23 17 18 19 20 21 22 23 21 22 23 24 25 26 27 +24 25 26 27 28 24 25 26 27 28 29 30 28 29 30 + 31 + May 2002 June 2002 July 2002 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 1 1 2 3 4 5 6 + 5 6 7 8 9 10 11 2 3 4 5 6 7 8 7 8 9 10 11 12 13 +12 13 14 15 16 17 18 9 10 11 12 13 14 15 14 15 16 17 18 19 20 +19 20 21 22 23 24 25 16 17 18 19 20 21 22 21 22 23 24 25 26 27 +26 27 28 29 30 31 23 24 25 26 27 28 29 28 29 30 31 + 30 + August 2002 September 2002 October 2002 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 1 2 3 4 5 6 7 1 2 3 4 5 + 4 5 6 7 8 9 10 8 9 10 11 12 13 14 6 7 8 9 10 11 12 +11 12 13 14 15 16 17 15 16 17 18 19 20 21 13 14 15 16 17 18 19 +18 19 20 21 22 23 24 22 23 24 25 26 27 28 20 21 22 23 24 25 26 +25 26 27 28 29 30 31 29 30 27 28 29 30 31 + + November 2002 December 2002 January 2003 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 1 2 3 4 5 6 7 1 2 3 4 + 3 4 5 6 7 8 9 8 9 10 11 12 13 14 5 6 7 8 9 10 11 +10 11 12 13 14 15 16 15 16 17 18 19 20 21 12 13 14 15 16 17 18 +17 18 19 20 21 22 23 22 23 24 25 26 27 28 19 20 21 22 23 24 25 +24 25 26 27 28 29 30 29 30 31 26 27 28 29 30 31 + + February 2003 March 2003 April 2003 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 1 1 2 3 4 5 + 2 3 4 5 6 7 8 2 3 4 5 6 7 8 6 7 8 9 10 11 12 + 9 10 11 12 13 14 15 9 10 11 12 13 14 15 13 14 15 16 17 18 19 +16 17 18 19 20 21 22 16 17 18 19 20 21 22 20 21 22 23 24 25 26 +23 24 25 26 27 28 23 24 25 26 27 28 29 27 28 29 30 + 30 31 + May 2003 June 2003 July 2003 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 1 2 3 4 5 6 7 1 2 3 4 5 + 4 5 6 7 8 9 10 8 9 10 11 12 13 14 6 7 8 9 10 11 12 +11 12 13 14 15 16 17 15 16 17 18 19 20 21 13 14 15 16 17 18 19 +18 19 20 21 22 23 24 22 23 24 25 26 27 28 20 21 22 23 24 25 26 +25 26 27 28 29 30 31 29 30 27 28 29 30 31 + + August 2003 September 2003 October 2003 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 1 2 3 4 5 6 1 2 3 4 + 3 4 5 6 7 8 9 7 8 9 10 11 12 13 5 6 7 8 9 10 11 +10 11 12 13 14 15 16 14 15 16 17 18 19 20 12 13 14 15 16 17 18 +17 18 19 20 21 22 23 21 22 23 24 25 26 27 19 20 21 22 23 24 25 +24 25 26 27 28 29 30 28 29 30 26 27 28 29 30 31 +31 + November 2003 December 2003 January 2004 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 1 2 3 4 5 6 1 2 3 + 2 3 4 5 6 7 8 7 8 9 10 11 12 13 4 5 6 7 8 9 10 + 9 10 11 12 13 14 15 14 15 16 17 18 19 20 11 12 13 14 15 16 17 +16 17 18 19 20 21 22 21 22 23 24 25 26 27 18 19 20 21 22 23 24 +23 24 25 26 27 28 29 28 29 30 31 25 26 27 28 29 30 31 +30 + February 2004 March 2004 April 2004 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 7 1 2 3 4 5 6 1 2 3 + 8 9 10 11 12 13 14 7 8 9 10 11 12 13 4 5 6 7 8 9 10 +15 16 17 18 19 20 21 14 15 16 17 18 19 20 11 12 13 14 15 16 17 +22 23 24 25 26 27 28 21 22 23 24 25 26 27 18 19 20 21 22 23 24 +29 28 29 30 31 25 26 27 28 29 30 + + May 2004 June 2004 July 2004 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 1 2 3 4 5 1 2 3 + 2 3 4 5 6 7 8 6 7 8 9 10 11 12 4 5 6 7 8 9 10 + 9 10 11 12 13 14 15 13 14 15 16 17 18 19 11 12 13 14 15 16 17 +16 17 18 19 20 21 22 20 21 22 23 24 25 26 18 19 20 21 22 23 24 +23 24 25 26 27 28 29 27 28 29 30 25 26 27 28 29 30 31 +30 31 + August 2004 September 2004 October 2004 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 7 1 2 3 4 1 2 + 8 9 10 11 12 13 14 5 6 7 8 9 10 11 3 4 5 6 7 8 9 +15 16 17 18 19 20 21 12 13 14 15 16 17 18 10 11 12 13 14 15 16 +22 23 24 25 26 27 28 19 20 21 22 23 24 25 17 18 19 20 21 22 23 +29 30 31 26 27 28 29 30 24 25 26 27 28 29 30 + 31 + November 2004 December 2004 January 2005 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 1 2 3 4 1 + 7 8 9 10 11 12 13 5 6 7 8 9 10 11 2 3 4 5 6 7 8 +14 15 16 17 18 19 20 12 13 14 15 16 17 18 9 10 11 12 13 14 15 +21 22 23 24 25 26 27 19 20 21 22 23 24 25 16 17 18 19 20 21 22 +28 29 30 26 27 28 29 30 31 23 24 25 26 27 28 29 + 30 31 + February 2005 March 2005 April 2005 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 1 2 3 4 5 1 2 + 6 7 8 9 10 11 12 6 7 8 9 10 11 12 3 4 5 6 7 8 9 +13 14 15 16 17 18 19 13 14 15 16 17 18 19 10 11 12 13 14 15 16 +20 21 22 23 24 25 26 20 21 22 23 24 25 26 17 18 19 20 21 22 23 +27 28 27 28 29 30 31 24 25 26 27 28 29 30 + + May 2005 June 2005 July 2005 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 7 1 2 3 4 1 2 + 8 9 10 11 12 13 14 5 6 7 8 9 10 11 3 4 5 6 7 8 9 +15 16 17 18 19 20 21 12 13 14 15 16 17 18 10 11 12 13 14 15 16 +22 23 24 25 26 27 28 19 20 21 22 23 24 25 17 18 19 20 21 22 23 +29 30 31 26 27 28 29 30 24 25 26 27 28 29 30 + 31 + August 2005 September 2005 October 2005 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 1 2 3 1 + 7 8 9 10 11 12 13 4 5 6 7 8 9 10 2 3 4 5 6 7 8 +14 15 16 17 18 19 20 11 12 13 14 15 16 17 9 10 11 12 13 14 15 +21 22 23 24 25 26 27 18 19 20 21 22 23 24 16 17 18 19 20 21 22 +28 29 30 31 25 26 27 28 29 30 23 24 25 26 27 28 29 + 30 31 + November 2005 December 2005 January 2006 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 1 2 3 1 2 3 4 5 6 7 + 6 7 8 9 10 11 12 4 5 6 7 8 9 10 8 9 10 11 12 13 14 +13 14 15 16 17 18 19 11 12 13 14 15 16 17 15 16 17 18 19 20 21 +20 21 22 23 24 25 26 18 19 20 21 22 23 24 22 23 24 25 26 27 28 +27 28 29 30 25 26 27 28 29 30 31 29 30 31 + + February 2006 March 2006 April 2006 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 1 2 3 4 1 + 5 6 7 8 9 10 11 5 6 7 8 9 10 11 2 3 4 5 6 7 8 +12 13 14 15 16 17 18 12 13 14 15 16 17 18 9 10 11 12 13 14 15 +19 20 21 22 23 24 25 19 20 21 22 23 24 25 16 17 18 19 20 21 22 +26 27 28 26 27 28 29 30 31 23 24 25 26 27 28 29 + 30 + May 2006 June 2006 July 2006 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 1 2 3 1 + 7 8 9 10 11 12 13 4 5 6 7 8 9 10 2 3 4 5 6 7 8 +14 15 16 17 18 19 20 11 12 13 14 15 16 17 9 10 11 12 13 14 15 +21 22 23 24 25 26 27 18 19 20 21 22 23 24 16 17 18 19 20 21 22 +28 29 30 31 25 26 27 28 29 30 23 24 25 26 27 28 29 + 30 31 + August 2006 September 2006 October 2006 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 1 2 1 2 3 4 5 6 7 + 6 7 8 9 10 11 12 3 4 5 6 7 8 9 8 9 10 11 12 13 14 +13 14 15 16 17 18 19 10 11 12 13 14 15 16 15 16 17 18 19 20 21 +20 21 22 23 24 25 26 17 18 19 20 21 22 23 22 23 24 25 26 27 28 +27 28 29 30 31 24 25 26 27 28 29 30 29 30 31 + + November 2006 December 2006 January 2007 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 1 2 1 2 3 4 5 6 + 5 6 7 8 9 10 11 3 4 5 6 7 8 9 7 8 9 10 11 12 13 +12 13 14 15 16 17 18 10 11 12 13 14 15 16 14 15 16 17 18 19 20 +19 20 21 22 23 24 25 17 18 19 20 21 22 23 21 22 23 24 25 26 27 +26 27 28 29 30 24 25 26 27 28 29 30 28 29 30 31 + 31 + February 2007 March 2007 April 2007 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 1 2 3 1 2 3 4 5 6 7 + 4 5 6 7 8 9 10 4 5 6 7 8 9 10 8 9 10 11 12 13 14 +11 12 13 14 15 16 17 11 12 13 14 15 16 17 15 16 17 18 19 20 21 +18 19 20 21 22 23 24 18 19 20 21 22 23 24 22 23 24 25 26 27 28 +25 26 27 28 25 26 27 28 29 30 31 29 30 + + May 2007 June 2007 July 2007 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 1 2 1 2 3 4 5 6 7 + 6 7 8 9 10 11 12 3 4 5 6 7 8 9 8 9 10 11 12 13 14 +13 14 15 16 17 18 19 10 11 12 13 14 15 16 15 16 17 18 19 20 21 +20 21 22 23 24 25 26 17 18 19 20 21 22 23 22 23 24 25 26 27 28 +27 28 29 30 31 24 25 26 27 28 29 30 29 30 31 + + August 2007 September 2007 October 2007 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 1 1 2 3 4 5 6 + 5 6 7 8 9 10 11 2 3 4 5 6 7 8 7 8 9 10 11 12 13 +12 13 14 15 16 17 18 9 10 11 12 13 14 15 14 15 16 17 18 19 20 +19 20 21 22 23 24 25 16 17 18 19 20 21 22 21 22 23 24 25 26 27 +26 27 28 29 30 31 23 24 25 26 27 28 29 28 29 30 31 + 30 + November 2007 December 2007 January 2008 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 1 1 2 3 4 5 + 4 5 6 7 8 9 10 2 3 4 5 6 7 8 6 7 8 9 10 11 12 +11 12 13 14 15 16 17 9 10 11 12 13 14 15 13 14 15 16 17 18 19 +18 19 20 21 22 23 24 16 17 18 19 20 21 22 20 21 22 23 24 25 26 +25 26 27 28 29 30 23 24 25 26 27 28 29 27 28 29 30 31 + 30 31 + February 2008 March 2008 April 2008 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 1 1 2 3 4 5 + 3 4 5 6 7 8 9 2 3 4 5 6 7 8 6 7 8 9 10 11 12 +10 11 12 13 14 15 16 9 10 11 12 13 14 15 13 14 15 16 17 18 19 +17 18 19 20 21 22 23 16 17 18 19 20 21 22 20 21 22 23 24 25 26 +24 25 26 27 28 29 23 24 25 26 27 28 29 27 28 29 30 + 30 31 + May 2008 June 2008 July 2008 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 1 2 3 4 5 6 7 1 2 3 4 5 + 4 5 6 7 8 9 10 8 9 10 11 12 13 14 6 7 8 9 10 11 12 +11 12 13 14 15 16 17 15 16 17 18 19 20 21 13 14 15 16 17 18 19 +18 19 20 21 22 23 24 22 23 24 25 26 27 28 20 21 22 23 24 25 26 +25 26 27 28 29 30 31 29 30 27 28 29 30 31 + + August 2008 September 2008 October 2008 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 1 2 3 4 5 6 1 2 3 4 + 3 4 5 6 7 8 9 7 8 9 10 11 12 13 5 6 7 8 9 10 11 +10 11 12 13 14 15 16 14 15 16 17 18 19 20 12 13 14 15 16 17 18 +17 18 19 20 21 22 23 21 22 23 24 25 26 27 19 20 21 22 23 24 25 +24 25 26 27 28 29 30 28 29 30 26 27 28 29 30 31 +31 + November 2008 December 2008 January 2009 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 1 2 3 4 5 6 1 2 3 + 2 3 4 5 6 7 8 7 8 9 10 11 12 13 4 5 6 7 8 9 10 + 9 10 11 12 13 14 15 14 15 16 17 18 19 20 11 12 13 14 15 16 17 +16 17 18 19 20 21 22 21 22 23 24 25 26 27 18 19 20 21 22 23 24 +23 24 25 26 27 28 29 28 29 30 31 25 26 27 28 29 30 31 +30 + February 2009 March 2009 April 2009 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 7 1 2 3 4 5 6 7 1 2 3 4 + 8 9 10 11 12 13 14 8 9 10 11 12 13 14 5 6 7 8 9 10 11 +15 16 17 18 19 20 21 15 16 17 18 19 20 21 12 13 14 15 16 17 18 +22 23 24 25 26 27 28 22 23 24 25 26 27 28 19 20 21 22 23 24 25 + 29 30 31 26 27 28 29 30 + + May 2009 June 2009 July 2009 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 1 2 3 4 5 6 1 2 3 4 + 3 4 5 6 7 8 9 7 8 9 10 11 12 13 5 6 7 8 9 10 11 +10 11 12 13 14 15 16 14 15 16 17 18 19 20 12 13 14 15 16 17 18 +17 18 19 20 21 22 23 21 22 23 24 25 26 27 19 20 21 22 23 24 25 +24 25 26 27 28 29 30 28 29 30 26 27 28 29 30 31 +31 + August 2009 September 2009 October 2009 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 1 2 3 4 5 1 2 3 + 2 3 4 5 6 7 8 6 7 8 9 10 11 12 4 5 6 7 8 9 10 + 9 10 11 12 13 14 15 13 14 15 16 17 18 19 11 12 13 14 15 16 17 +16 17 18 19 20 21 22 20 21 22 23 24 25 26 18 19 20 21 22 23 24 +23 24 25 26 27 28 29 27 28 29 30 25 26 27 28 29 30 31 +30 31 + November 2009 December 2009 January 2010 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 7 1 2 3 4 5 1 2 + 8 9 10 11 12 13 14 6 7 8 9 10 11 12 3 4 5 6 7 8 9 +15 16 17 18 19 20 21 13 14 15 16 17 18 19 10 11 12 13 14 15 16 +22 23 24 25 26 27 28 20 21 22 23 24 25 26 17 18 19 20 21 22 23 +29 30 27 28 29 30 31 24 25 26 27 28 29 30 + 31 + February 2010 March 2010 April 2010 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 1 2 3 4 5 6 1 2 3 + 7 8 9 10 11 12 13 7 8 9 10 11 12 13 4 5 6 7 8 9 10 +14 15 16 17 18 19 20 14 15 16 17 18 19 20 11 12 13 14 15 16 17 +21 22 23 24 25 26 27 21 22 23 24 25 26 27 18 19 20 21 22 23 24 +28 28 29 30 31 25 26 27 28 29 30 + + May 2010 June 2010 July 2010 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 1 2 3 4 5 1 2 3 + 2 3 4 5 6 7 8 6 7 8 9 10 11 12 4 5 6 7 8 9 10 + 9 10 11 12 13 14 15 13 14 15 16 17 18 19 11 12 13 14 15 16 17 +16 17 18 19 20 21 22 20 21 22 23 24 25 26 18 19 20 21 22 23 24 +23 24 25 26 27 28 29 27 28 29 30 25 26 27 28 29 30 31 +30 31 + August 2010 September 2010 October 2010 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 7 1 2 3 4 1 2 + 8 9 10 11 12 13 14 5 6 7 8 9 10 11 3 4 5 6 7 8 9 +15 16 17 18 19 20 21 12 13 14 15 16 17 18 10 11 12 13 14 15 16 +22 23 24 25 26 27 28 19 20 21 22 23 24 25 17 18 19 20 21 22 23 +29 30 31 26 27 28 29 30 24 25 26 27 28 29 30 + 31 + November 2010 December 2010 January 2011 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 1 2 3 4 1 + 7 8 9 10 11 12 13 5 6 7 8 9 10 11 2 3 4 5 6 7 8 +14 15 16 17 18 19 20 12 13 14 15 16 17 18 9 10 11 12 13 14 15 +21 22 23 24 25 26 27 19 20 21 22 23 24 25 16 17 18 19 20 21 22 +28 29 30 26 27 28 29 30 31 23 24 25 26 27 28 29 + 30 31 + February 2011 March 2011 April 2011 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 1 2 3 4 5 1 2 + 6 7 8 9 10 11 12 6 7 8 9 10 11 12 3 4 5 6 7 8 9 +13 14 15 16 17 18 19 13 14 15 16 17 18 19 10 11 12 13 14 15 16 +20 21 22 23 24 25 26 20 21 22 23 24 25 26 17 18 19 20 21 22 23 +27 28 27 28 29 30 31 24 25 26 27 28 29 30 + + May 2011 June 2011 July 2011 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 7 1 2 3 4 1 2 + 8 9 10 11 12 13 14 5 6 7 8 9 10 11 3 4 5 6 7 8 9 +15 16 17 18 19 20 21 12 13 14 15 16 17 18 10 11 12 13 14 15 16 +22 23 24 25 26 27 28 19 20 21 22 23 24 25 17 18 19 20 21 22 23 +29 30 31 26 27 28 29 30 24 25 26 27 28 29 30 + 31 + August 2011 September 2011 October 2011 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 1 2 3 1 + 7 8 9 10 11 12 13 4 5 6 7 8 9 10 2 3 4 5 6 7 8 +14 15 16 17 18 19 20 11 12 13 14 15 16 17 9 10 11 12 13 14 15 +21 22 23 24 25 26 27 18 19 20 21 22 23 24 16 17 18 19 20 21 22 +28 29 30 31 25 26 27 28 29 30 23 24 25 26 27 28 29 + 30 31 + November 2011 December 2011 January 2012 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 1 2 3 1 2 3 4 5 6 7 + 6 7 8 9 10 11 12 4 5 6 7 8 9 10 8 9 10 11 12 13 14 +13 14 15 16 17 18 19 11 12 13 14 15 16 17 15 16 17 18 19 20 21 +20 21 22 23 24 25 26 18 19 20 21 22 23 24 22 23 24 25 26 27 28 +27 28 29 30 25 26 27 28 29 30 31 29 30 31 + + February 2012 March 2012 April 2012 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 1 2 3 1 2 3 4 5 6 7 + 5 6 7 8 9 10 11 4 5 6 7 8 9 10 8 9 10 11 12 13 14 +12 13 14 15 16 17 18 11 12 13 14 15 16 17 15 16 17 18 19 20 21 +19 20 21 22 23 24 25 18 19 20 21 22 23 24 22 23 24 25 26 27 28 +26 27 28 29 25 26 27 28 29 30 31 29 30 + + May 2012 June 2012 July 2012 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 1 2 1 2 3 4 5 6 7 + 6 7 8 9 10 11 12 3 4 5 6 7 8 9 8 9 10 11 12 13 14 +13 14 15 16 17 18 19 10 11 12 13 14 15 16 15 16 17 18 19 20 21 +20 21 22 23 24 25 26 17 18 19 20 21 22 23 22 23 24 25 26 27 28 +27 28 29 30 31 24 25 26 27 28 29 30 29 30 31 + + August 2012 September 2012 October 2012 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 1 1 2 3 4 5 6 + 5 6 7 8 9 10 11 2 3 4 5 6 7 8 7 8 9 10 11 12 13 +12 13 14 15 16 17 18 9 10 11 12 13 14 15 14 15 16 17 18 19 20 +19 20 21 22 23 24 25 16 17 18 19 20 21 22 21 22 23 24 25 26 27 +26 27 28 29 30 31 23 24 25 26 27 28 29 28 29 30 31 + 30 + November 2012 December 2012 January 2013 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 1 1 2 3 4 5 + 4 5 6 7 8 9 10 2 3 4 5 6 7 8 6 7 8 9 10 11 12 +11 12 13 14 15 16 17 9 10 11 12 13 14 15 13 14 15 16 17 18 19 +18 19 20 21 22 23 24 16 17 18 19 20 21 22 20 21 22 23 24 25 26 +25 26 27 28 29 30 23 24 25 26 27 28 29 27 28 29 30 31 + 30 31 + February 2013 March 2013 April 2013 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 1 2 1 2 3 4 5 6 + 3 4 5 6 7 8 9 3 4 5 6 7 8 9 7 8 9 10 11 12 13 +10 11 12 13 14 15 16 10 11 12 13 14 15 16 14 15 16 17 18 19 20 +17 18 19 20 21 22 23 17 18 19 20 21 22 23 21 22 23 24 25 26 27 +24 25 26 27 28 24 25 26 27 28 29 30 28 29 30 + 31 + May 2013 June 2013 July 2013 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 1 1 2 3 4 5 6 + 5 6 7 8 9 10 11 2 3 4 5 6 7 8 7 8 9 10 11 12 13 +12 13 14 15 16 17 18 9 10 11 12 13 14 15 14 15 16 17 18 19 20 +19 20 21 22 23 24 25 16 17 18 19 20 21 22 21 22 23 24 25 26 27 +26 27 28 29 30 31 23 24 25 26 27 28 29 28 29 30 31 + 30 + August 2013 September 2013 October 2013 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 1 2 3 4 5 6 7 1 2 3 4 5 + 4 5 6 7 8 9 10 8 9 10 11 12 13 14 6 7 8 9 10 11 12 +11 12 13 14 15 16 17 15 16 17 18 19 20 21 13 14 15 16 17 18 19 +18 19 20 21 22 23 24 22 23 24 25 26 27 28 20 21 22 23 24 25 26 +25 26 27 28 29 30 31 29 30 27 28 29 30 31 + + November 2013 December 2013 January 2014 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 1 2 3 4 5 6 7 1 2 3 4 + 3 4 5 6 7 8 9 8 9 10 11 12 13 14 5 6 7 8 9 10 11 +10 11 12 13 14 15 16 15 16 17 18 19 20 21 12 13 14 15 16 17 18 +17 18 19 20 21 22 23 22 23 24 25 26 27 28 19 20 21 22 23 24 25 +24 25 26 27 28 29 30 29 30 31 26 27 28 29 30 31 + + February 2014 March 2014 April 2014 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 1 1 2 3 4 5 + 2 3 4 5 6 7 8 2 3 4 5 6 7 8 6 7 8 9 10 11 12 + 9 10 11 12 13 14 15 9 10 11 12 13 14 15 13 14 15 16 17 18 19 +16 17 18 19 20 21 22 16 17 18 19 20 21 22 20 21 22 23 24 25 26 +23 24 25 26 27 28 23 24 25 26 27 28 29 27 28 29 30 + 30 31 + May 2014 June 2014 July 2014 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 1 2 3 4 5 6 7 1 2 3 4 5 + 4 5 6 7 8 9 10 8 9 10 11 12 13 14 6 7 8 9 10 11 12 +11 12 13 14 15 16 17 15 16 17 18 19 20 21 13 14 15 16 17 18 19 +18 19 20 21 22 23 24 22 23 24 25 26 27 28 20 21 22 23 24 25 26 +25 26 27 28 29 30 31 29 30 27 28 29 30 31 + + August 2014 September 2014 October 2014 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 1 2 3 4 5 6 1 2 3 4 + 3 4 5 6 7 8 9 7 8 9 10 11 12 13 5 6 7 8 9 10 11 +10 11 12 13 14 15 16 14 15 16 17 18 19 20 12 13 14 15 16 17 18 +17 18 19 20 21 22 23 21 22 23 24 25 26 27 19 20 21 22 23 24 25 +24 25 26 27 28 29 30 28 29 30 26 27 28 29 30 31 +31 + November 2014 December 2014 January 2015 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 1 2 3 4 5 6 1 2 3 + 2 3 4 5 6 7 8 7 8 9 10 11 12 13 4 5 6 7 8 9 10 + 9 10 11 12 13 14 15 14 15 16 17 18 19 20 11 12 13 14 15 16 17 +16 17 18 19 20 21 22 21 22 23 24 25 26 27 18 19 20 21 22 23 24 +23 24 25 26 27 28 29 28 29 30 31 25 26 27 28 29 30 31 +30 diff --git a/tests/expected/cal/month-Sn21 b/tests/expected/cal/month-Sn21 new file mode 100644 index 000000000..128975f86 --- /dev/null +++ b/tests/expected/cal/month-Sn21 @@ -0,0 +1,57 @@ +Large span + November 2005 December 2005 January 2006 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 1 2 3 1 2 3 4 5 6 7 + 6 7 8 9 10 11 12 4 5 6 7 8 9 10 8 9 10 11 12 13 14 +13 14 15 16 17 18 19 11 12 13 14 15 16 17 15 16 17 18 19 20 21 +20 21 22 23 24 25 26 18 19 20 21 22 23 24 22 23 24 25 26 27 28 +27 28 29 30 25 26 27 28 29 30 31 29 30 31 + + February 2006 March 2006 April 2006 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 1 2 3 4 1 + 5 6 7 8 9 10 11 5 6 7 8 9 10 11 2 3 4 5 6 7 8 +12 13 14 15 16 17 18 12 13 14 15 16 17 18 9 10 11 12 13 14 15 +19 20 21 22 23 24 25 19 20 21 22 23 24 25 16 17 18 19 20 21 22 +26 27 28 26 27 28 29 30 31 23 24 25 26 27 28 29 + 30 + May 2006 June 2006 July 2006 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 1 2 3 1 + 7 8 9 10 11 12 13 4 5 6 7 8 9 10 2 3 4 5 6 7 8 +14 15 16 17 18 19 20 11 12 13 14 15 16 17 9 10 11 12 13 14 15 +21 22 23 24 25 26 27 18 19 20 21 22 23 24 16 17 18 19 20 21 22 +28 29 30 31 25 26 27 28 29 30 23 24 25 26 27 28 29 + 30 31 + August 2006 September 2006 October 2006 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 1 2 1 2 3 4 5 6 7 + 6 7 8 9 10 11 12 3 4 5 6 7 8 9 8 9 10 11 12 13 14 +13 14 15 16 17 18 19 10 11 12 13 14 15 16 15 16 17 18 19 20 21 +20 21 22 23 24 25 26 17 18 19 20 21 22 23 22 23 24 25 26 27 28 +27 28 29 30 31 24 25 26 27 28 29 30 29 30 31 + + November 2006 December 2006 January 2007 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 1 2 1 2 3 4 5 6 + 5 6 7 8 9 10 11 3 4 5 6 7 8 9 7 8 9 10 11 12 13 +12 13 14 15 16 17 18 10 11 12 13 14 15 16 14 15 16 17 18 19 20 +19 20 21 22 23 24 25 17 18 19 20 21 22 23 21 22 23 24 25 26 27 +26 27 28 29 30 24 25 26 27 28 29 30 28 29 30 31 + 31 + February 2007 March 2007 April 2007 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 1 2 3 1 2 3 4 5 6 7 + 4 5 6 7 8 9 10 4 5 6 7 8 9 10 8 9 10 11 12 13 14 +11 12 13 14 15 16 17 11 12 13 14 15 16 17 15 16 17 18 19 20 21 +18 19 20 21 22 23 24 18 19 20 21 22 23 24 22 23 24 25 26 27 28 +25 26 27 28 25 26 27 28 29 30 31 29 30 + + May 2007 June 2007 July 2007 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 1 2 1 2 3 4 5 6 7 + 6 7 8 9 10 11 12 3 4 5 6 7 8 9 8 9 10 11 12 13 14 +13 14 15 16 17 18 19 10 11 12 13 14 15 16 15 16 17 18 19 20 21 +20 21 22 23 24 25 26 17 18 19 20 21 22 23 22 23 24 25 26 27 28 +27 28 29 30 31 24 25 26 27 28 29 30 29 30 31 + diff --git a/tests/expected/cal/month-Sn3 b/tests/expected/cal/month-Sn3 new file mode 100644 index 000000000..0f03e0339 --- /dev/null +++ b/tests/expected/cal/month-Sn3 @@ -0,0 +1,9 @@ +Normal span + August 2006 September 2006 October 2006 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 1 2 1 2 3 4 5 6 7 + 6 7 8 9 10 11 12 3 4 5 6 7 8 9 8 9 10 11 12 13 14 +13 14 15 16 17 18 19 10 11 12 13 14 15 16 15 16 17 18 19 20 21 +20 21 22 23 24 25 26 17 18 19 20 21 22 23 22 23 24 25 26 27 28 +27 28 29 30 31 24 25 26 27 28 29 30 29 30 31 + diff --git a/tests/expected/cal/month-Sn51 b/tests/expected/cal/month-Sn51 new file mode 100644 index 000000000..f899b448b --- /dev/null +++ b/tests/expected/cal/month-Sn51 @@ -0,0 +1,137 @@ +Very Large span + August 2004 September 2004 October 2004 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 7 1 2 3 4 1 2 + 8 9 10 11 12 13 14 5 6 7 8 9 10 11 3 4 5 6 7 8 9 +15 16 17 18 19 20 21 12 13 14 15 16 17 18 10 11 12 13 14 15 16 +22 23 24 25 26 27 28 19 20 21 22 23 24 25 17 18 19 20 21 22 23 +29 30 31 26 27 28 29 30 24 25 26 27 28 29 30 + 31 + November 2004 December 2004 January 2005 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 1 2 3 4 1 + 7 8 9 10 11 12 13 5 6 7 8 9 10 11 2 3 4 5 6 7 8 +14 15 16 17 18 19 20 12 13 14 15 16 17 18 9 10 11 12 13 14 15 +21 22 23 24 25 26 27 19 20 21 22 23 24 25 16 17 18 19 20 21 22 +28 29 30 26 27 28 29 30 31 23 24 25 26 27 28 29 + 30 31 + February 2005 March 2005 April 2005 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 1 2 3 4 5 1 2 + 6 7 8 9 10 11 12 6 7 8 9 10 11 12 3 4 5 6 7 8 9 +13 14 15 16 17 18 19 13 14 15 16 17 18 19 10 11 12 13 14 15 16 +20 21 22 23 24 25 26 20 21 22 23 24 25 26 17 18 19 20 21 22 23 +27 28 27 28 29 30 31 24 25 26 27 28 29 30 + + May 2005 June 2005 July 2005 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 7 1 2 3 4 1 2 + 8 9 10 11 12 13 14 5 6 7 8 9 10 11 3 4 5 6 7 8 9 +15 16 17 18 19 20 21 12 13 14 15 16 17 18 10 11 12 13 14 15 16 +22 23 24 25 26 27 28 19 20 21 22 23 24 25 17 18 19 20 21 22 23 +29 30 31 26 27 28 29 30 24 25 26 27 28 29 30 + 31 + August 2005 September 2005 October 2005 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 1 2 3 1 + 7 8 9 10 11 12 13 4 5 6 7 8 9 10 2 3 4 5 6 7 8 +14 15 16 17 18 19 20 11 12 13 14 15 16 17 9 10 11 12 13 14 15 +21 22 23 24 25 26 27 18 19 20 21 22 23 24 16 17 18 19 20 21 22 +28 29 30 31 25 26 27 28 29 30 23 24 25 26 27 28 29 + 30 31 + November 2005 December 2005 January 2006 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 1 2 3 1 2 3 4 5 6 7 + 6 7 8 9 10 11 12 4 5 6 7 8 9 10 8 9 10 11 12 13 14 +13 14 15 16 17 18 19 11 12 13 14 15 16 17 15 16 17 18 19 20 21 +20 21 22 23 24 25 26 18 19 20 21 22 23 24 22 23 24 25 26 27 28 +27 28 29 30 25 26 27 28 29 30 31 29 30 31 + + February 2006 March 2006 April 2006 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 1 2 3 4 1 + 5 6 7 8 9 10 11 5 6 7 8 9 10 11 2 3 4 5 6 7 8 +12 13 14 15 16 17 18 12 13 14 15 16 17 18 9 10 11 12 13 14 15 +19 20 21 22 23 24 25 19 20 21 22 23 24 25 16 17 18 19 20 21 22 +26 27 28 26 27 28 29 30 31 23 24 25 26 27 28 29 + 30 + May 2006 June 2006 July 2006 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 6 1 2 3 1 + 7 8 9 10 11 12 13 4 5 6 7 8 9 10 2 3 4 5 6 7 8 +14 15 16 17 18 19 20 11 12 13 14 15 16 17 9 10 11 12 13 14 15 +21 22 23 24 25 26 27 18 19 20 21 22 23 24 16 17 18 19 20 21 22 +28 29 30 31 25 26 27 28 29 30 23 24 25 26 27 28 29 + 30 31 + August 2006 September 2006 October 2006 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 1 2 1 2 3 4 5 6 7 + 6 7 8 9 10 11 12 3 4 5 6 7 8 9 8 9 10 11 12 13 14 +13 14 15 16 17 18 19 10 11 12 13 14 15 16 15 16 17 18 19 20 21 +20 21 22 23 24 25 26 17 18 19 20 21 22 23 22 23 24 25 26 27 28 +27 28 29 30 31 24 25 26 27 28 29 30 29 30 31 + + November 2006 December 2006 January 2007 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 1 2 1 2 3 4 5 6 + 5 6 7 8 9 10 11 3 4 5 6 7 8 9 7 8 9 10 11 12 13 +12 13 14 15 16 17 18 10 11 12 13 14 15 16 14 15 16 17 18 19 20 +19 20 21 22 23 24 25 17 18 19 20 21 22 23 21 22 23 24 25 26 27 +26 27 28 29 30 24 25 26 27 28 29 30 28 29 30 31 + 31 + February 2007 March 2007 April 2007 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 1 2 3 1 2 3 4 5 6 7 + 4 5 6 7 8 9 10 4 5 6 7 8 9 10 8 9 10 11 12 13 14 +11 12 13 14 15 16 17 11 12 13 14 15 16 17 15 16 17 18 19 20 21 +18 19 20 21 22 23 24 18 19 20 21 22 23 24 22 23 24 25 26 27 28 +25 26 27 28 25 26 27 28 29 30 31 29 30 + + May 2007 June 2007 July 2007 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 5 1 2 1 2 3 4 5 6 7 + 6 7 8 9 10 11 12 3 4 5 6 7 8 9 8 9 10 11 12 13 14 +13 14 15 16 17 18 19 10 11 12 13 14 15 16 15 16 17 18 19 20 21 +20 21 22 23 24 25 26 17 18 19 20 21 22 23 22 23 24 25 26 27 28 +27 28 29 30 31 24 25 26 27 28 29 30 29 30 31 + + August 2007 September 2007 October 2007 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 4 1 1 2 3 4 5 6 + 5 6 7 8 9 10 11 2 3 4 5 6 7 8 7 8 9 10 11 12 13 +12 13 14 15 16 17 18 9 10 11 12 13 14 15 14 15 16 17 18 19 20 +19 20 21 22 23 24 25 16 17 18 19 20 21 22 21 22 23 24 25 26 27 +26 27 28 29 30 31 23 24 25 26 27 28 29 28 29 30 31 + 30 + November 2007 December 2007 January 2008 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 1 1 2 3 4 5 + 4 5 6 7 8 9 10 2 3 4 5 6 7 8 6 7 8 9 10 11 12 +11 12 13 14 15 16 17 9 10 11 12 13 14 15 13 14 15 16 17 18 19 +18 19 20 21 22 23 24 16 17 18 19 20 21 22 20 21 22 23 24 25 26 +25 26 27 28 29 30 23 24 25 26 27 28 29 27 28 29 30 31 + 30 31 + February 2008 March 2008 April 2008 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 1 1 2 3 4 5 + 3 4 5 6 7 8 9 2 3 4 5 6 7 8 6 7 8 9 10 11 12 +10 11 12 13 14 15 16 9 10 11 12 13 14 15 13 14 15 16 17 18 19 +17 18 19 20 21 22 23 16 17 18 19 20 21 22 20 21 22 23 24 25 26 +24 25 26 27 28 29 23 24 25 26 27 28 29 27 28 29 30 + 30 31 + May 2008 June 2008 July 2008 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 3 1 2 3 4 5 6 7 1 2 3 4 5 + 4 5 6 7 8 9 10 8 9 10 11 12 13 14 6 7 8 9 10 11 12 +11 12 13 14 15 16 17 15 16 17 18 19 20 21 13 14 15 16 17 18 19 +18 19 20 21 22 23 24 22 23 24 25 26 27 28 20 21 22 23 24 25 26 +25 26 27 28 29 30 31 29 30 27 28 29 30 31 + + August 2008 September 2008 October 2008 +Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa Su Mo Tu We Th Fr Sa + 1 2 1 2 3 4 5 6 1 2 3 4 + 3 4 5 6 7 8 9 7 8 9 10 11 12 13 5 6 7 8 9 10 11 +10 11 12 13 14 15 16 14 15 16 17 18 19 20 12 13 14 15 16 17 18 +17 18 19 20 21 22 23 21 22 23 24 25 26 27 19 20 21 22 23 24 25 +24 25 26 27 28 29 30 28 29 30 26 27 28 29 30 31 +31 diff --git a/tests/expected/col/multibyte b/tests/expected/col/multibyte index c6d36cce3..4e299adc1 100644 --- a/tests/expected/col/multibyte +++ b/tests/expected/col/multibyte @@ -1 +1 @@ -col: Invalid or incomplete multibyte or wide character +col: failed on line 1: Invalid or incomplete multibyte or wide character diff --git a/tests/expected/column/table-empty-column b/tests/expected/column/table-empty-column new file mode 100644 index 000000000..ed32da96c --- /dev/null +++ b/tests/expected/column/table-empty-column @@ -0,0 +1 @@ +:a:b diff --git a/tests/expected/column/table-empty-lines b/tests/expected/column/table-empty-lines new file mode 100644 index 000000000..5e8fb21e1 --- /dev/null +++ b/tests/expected/column/table-empty-lines @@ -0,0 +1,6 @@ + +A B CCC +AA BBB AA +AAA BB C + +AAAA BBBB CCCC diff --git a/tests/expected/column/table-noempty-lines b/tests/expected/column/table-noempty-lines new file mode 100644 index 000000000..6a45feedd --- /dev/null +++ b/tests/expected/column/table-noempty-lines @@ -0,0 +1,4 @@ +A B CCC +AA BBB AA +AAA BB C +AAAA BBBB CCCC diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K index 8bdc50ece..e6aa145c9 100644 --- a/tests/expected/fdisk/align-512-4K +++ b/tests/expected/fdisk/align-512-4K @@ -10,19 +10,19 @@ Created a new <removed>. Command (m for help): Partition type p primary (0 primary, 0 extended, 4 free) e extended (container for logical partitions) -Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-102399, default 102399): +Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Last sector, +/-sectors or +/-size{K,M,G,T,P} (2048-102399, default 102399): Created a new <removed>. Command (m for help): Partition type p primary (1 primary, 0 extended, 3 free) e extended (container for logical partitions) -Select (default p): Partition number (2-4, default 2): First sector (22528-102399, default 22528): Last sector, +sectors or +size{K,M,G,T,P} (22528-102399, default 102399): +Select (default p): Partition number (2-4, default 2): First sector (22528-102399, default 22528): Last sector, +/-sectors or +/-size{K,M,G,T,P} (22528-102399, default 102399): Created a new <removed>. Command (m for help): Partition type p primary (2 primary, 0 extended, 2 free) e extended (container for logical partitions) -Select (default p): Partition number (3,4, default 3): First sector (43008-102399, default 43008): Last sector, +sectors or +size{K,M,G,T,P} (43008-102399, default 102399): +Select (default p): Partition number (3,4, default 3): First sector (43008-102399, default 43008): Last sector, +/-sectors or +/-size{K,M,G,T,P} (43008-102399, default 102399): Created a new <removed>. Command (m for help): Partition type @@ -30,25 +30,26 @@ Command (m for help): Partition type e extended (container for logical partitions) Select (default e): Selected partition 4 -First sector (63488-102399, default 63488): Last sector, +sectors or +size{K,M,G,T,P} (63488-102399, default 102399): +First sector (63488-102399, default 63488): Last sector, +/-sectors or +/-size{K,M,G,T,P} (63488-102399, default 102399): Created a new <removed>. Command (m for help): All primary partitions are in use. Adding logical partition 5 -First sector (65536-102399, default 65536): Last sector, +sectors or +size{K,M,G,T,P} (65536-102399, default 102399): +First sector (65536-102399, default 65536): Last sector, +/-sectors or +/-size{K,M,G,T,P} (65536-102399, default 102399): Created a new <removed>. Command (m for help): All primary partitions are in use. Adding logical partition 6 -First sector (77824-102399, default 77824): Last sector, +sectors or +size{K,M,G,T,P} (77824-102399, default 102399): +First sector (77824-102399, default 77824): Last sector, +/-sectors or +/-size{K,M,G,T,P} (77824-102399, default 102399): Created a new <removed>. Command (m for help): All primary partitions are in use. Adding logical partition 7 -First sector (90112-102399, default 90112): Last sector, +sectors or +size{K,M,G,T,P} (90112-102399, default 102399): +First sector (90112-102399, default 90112): Last sector, +/-sectors or +/-size{K,M,G,T,P} (90112-102399, default 102399): Created a new <removed>. Command (m for help): Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/fdisk/align-512-4K-63 b/tests/expected/fdisk/align-512-4K-63 index e469ab7a3..831e7dc98 100644 --- a/tests/expected/fdisk/align-512-4K-63 +++ b/tests/expected/fdisk/align-512-4K-63 @@ -10,19 +10,19 @@ Created a new <removed>. Command (m for help): Partition type p primary (0 primary, 0 extended, 4 free) e extended (container for logical partitions) -Select (default p): Partition number (1-4, default 1): First sector (7-102399, default 7): Last sector, +sectors or +size{K,M,G,T,P} (7-102399, default 102399): +Select (default p): Partition number (1-4, default 1): First sector (7-102399, default 7): Last sector, +/-sectors or +/-size{K,M,G,T,P} (7-102399, default 102399): Created a new <removed>. Command (m for help): Partition type p primary (1 primary, 0 extended, 3 free) e extended (container for logical partitions) -Select (default p): Partition number (2-4, default 2): First sector (20487-102399, default 20487): Last sector, +sectors or +size{K,M,G,T,P} (20487-102399, default 102399): +Select (default p): Partition number (2-4, default 2): First sector (20487-102399, default 20487): Last sector, +/-sectors or +/-size{K,M,G,T,P} (20487-102399, default 102399): Created a new <removed>. Command (m for help): Partition type p primary (2 primary, 0 extended, 2 free) e extended (container for logical partitions) -Select (default p): Partition number (3,4, default 3): First sector (40967-102399, default 40967): Last sector, +sectors or +size{K,M,G,T,P} (40967-102399, default 102399): +Select (default p): Partition number (3,4, default 3): First sector (40967-102399, default 40967): Last sector, +/-sectors or +/-size{K,M,G,T,P} (40967-102399, default 102399): Created a new <removed>. Command (m for help): Partition type @@ -30,25 +30,26 @@ Command (m for help): Partition type e extended (container for logical partitions) Select (default e): Selected partition 4 -First sector (61447-102399, default 61447): Last sector, +sectors or +size{K,M,G,T,P} (61447-102399, default 102399): +First sector (61447-102399, default 61447): Last sector, +/-sectors or +/-size{K,M,G,T,P} (61447-102399, default 102399): Created a new <removed>. Command (m for help): All primary partitions are in use. Adding logical partition 5 -First sector (61454-102399, default 63487): Last sector, +sectors or +size{K,M,G,T,P} (63487-102399, default 102399): +First sector (61454-102399, default 63487): Last sector, +/-sectors or +/-size{K,M,G,T,P} (63487-102399, default 102399): Created a new <removed>. Command (m for help): All primary partitions are in use. Adding logical partition 6 -First sector (61454-102399, default 75775): Last sector, +sectors or +size{K,M,G,T,P} (75775-102399, default 102399): +First sector (61454-102399, default 75775): Last sector, +/-sectors or +/-size{K,M,G,T,P} (75775-102399, default 102399): Created a new <removed>. Command (m for help): All primary partitions are in use. Adding logical partition 7 -First sector (61454-102399, default 88063): Last sector, +sectors or +size{K,M,G,T,P} (88063-102399, default 102399): +First sector (61454-102399, default 88063): Last sector, +/-sectors or +/-size{K,M,G,T,P} (88063-102399, default 102399): Created a new <removed>. Command (m for help): Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/fdisk/align-512-4K-md b/tests/expected/fdisk/align-512-4K-md index caca03154..10f3ca6af 100644 --- a/tests/expected/fdisk/align-512-4K-md +++ b/tests/expected/fdisk/align-512-4K-md @@ -10,16 +10,17 @@ Created a new <removed>. Command (m for help): Partition type p primary (0 primary, 0 extended, 4 free) e extended (container for logical partitions) -Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-102399, default 102399): +Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Last sector, +/-sectors or +/-size{K,M,G,T,P} (2048-102399, default 102399): Created a new <removed>. Command (m for help): Partition type p primary (1 primary, 0 extended, 3 free) e extended (container for logical partitions) -Select (default p): Partition number (2-4, default 2): First sector (43008-102399, default 43008): Last sector, +sectors or +size{K,M,G,T,P} (43008-102399, default 102399): +Select (default p): Partition number (2-4, default 2): First sector (43008-102399, default 43008): Last sector, +/-sectors or +/-size{K,M,G,T,P} (43008-102399, default 102399): Created a new <removed>. Command (m for help): Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes @@ -49,13 +50,13 @@ Created a new <removed>. Command (m for help): Partition type p primary (0 primary, 0 extended, 4 free) e extended (container for logical partitions) -Select (default p): Partition number (1-4, default 1): First sector (2048-100095, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-100095, default 100095): +Select (default p): Partition number (1-4, default 1): First sector (2048-100095, default 2048): Last sector, +/-sectors or +/-size{K,M,G,T,P} (2048-100095, default 100095): Created a new <removed>. Command (m for help): Partition type p primary (1 primary, 0 extended, 3 free) e extended (container for logical partitions) -Select (default p): Partition number (2-4, default 2): First sector (22528-100095, default 22528): Last sector, +sectors or +size{K,M,G,T,P} (22528-100095, default 100095): +Select (default p): Partition number (2-4, default 2): First sector (22528-100095, default 22528): Last sector, +/-sectors or +/-size{K,M,G,T,P} (22528-100095, default 100095): Created a new <removed>. Command (m for help): Disk <removed>: 48.9 MiB, 51249152 bytes, 100096 sectors diff --git a/tests/expected/fdisk/align-512-512 b/tests/expected/fdisk/align-512-512 index ea24ba4ff..083641f47 100644 --- a/tests/expected/fdisk/align-512-512 +++ b/tests/expected/fdisk/align-512-512 @@ -10,19 +10,19 @@ Created a new <removed>. Command (m for help): Partition type p primary (0 primary, 0 extended, 4 free) e extended (container for logical partitions) -Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-102399, default 102399): +Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Last sector, +/-sectors or +/-size{K,M,G,T,P} (2048-102399, default 102399): Created a new <removed>. Command (m for help): Partition type p primary (1 primary, 0 extended, 3 free) e extended (container for logical partitions) -Select (default p): Partition number (2-4, default 2): First sector (22528-102399, default 22528): Last sector, +sectors or +size{K,M,G,T,P} (22528-102399, default 102399): +Select (default p): Partition number (2-4, default 2): First sector (22528-102399, default 22528): Last sector, +/-sectors or +/-size{K,M,G,T,P} (22528-102399, default 102399): Created a new <removed>. Command (m for help): Partition type p primary (2 primary, 0 extended, 2 free) e extended (container for logical partitions) -Select (default p): Partition number (3,4, default 3): First sector (43008-102399, default 43008): Last sector, +sectors or +size{K,M,G,T,P} (43008-102399, default 102399): +Select (default p): Partition number (3,4, default 3): First sector (43008-102399, default 43008): Last sector, +/-sectors or +/-size{K,M,G,T,P} (43008-102399, default 102399): Created a new <removed>. Command (m for help): Partition type @@ -30,22 +30,22 @@ Command (m for help): Partition type e extended (container for logical partitions) Select (default e): Selected partition 4 -First sector (63488-102399, default 63488): Last sector, +sectors or +size{K,M,G,T,P} (63488-102399, default 102399): +First sector (63488-102399, default 63488): Last sector, +/-sectors or +/-size{K,M,G,T,P} (63488-102399, default 102399): Created a new <removed>. Command (m for help): All primary partitions are in use. Adding logical partition 5 -First sector (65536-102399, default 65536): Last sector, +sectors or +size{K,M,G,T,P} (65536-102399, default 102399): +First sector (65536-102399, default 65536): Last sector, +/-sectors or +/-size{K,M,G,T,P} (65536-102399, default 102399): Created a new <removed>. Command (m for help): All primary partitions are in use. Adding logical partition 6 -First sector (77824-102399, default 77824): Last sector, +sectors or +size{K,M,G,T,P} (77824-102399, default 102399): +First sector (77824-102399, default 77824): Last sector, +/-sectors or +/-size{K,M,G,T,P} (77824-102399, default 102399): Created a new <removed>. Command (m for help): All primary partitions are in use. Adding logical partition 7 -First sector (90112-102399, default 90112): Last sector, +sectors or +size{K,M,G,T,P} (90112-102399, default 102399): +First sector (90112-102399, default 90112): Last sector, +/-sectors or +/-size{K,M,G,T,P} (90112-102399, default 102399): Created a new <removed>. Command (m for help): Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors diff --git a/tests/expected/fdisk/align-512-512-topology b/tests/expected/fdisk/align-512-512-topology index 7856dcc04..65420b6b9 100644 --- a/tests/expected/fdisk/align-512-512-topology +++ b/tests/expected/fdisk/align-512-512-topology @@ -10,19 +10,19 @@ Created a new <removed>. Command (m for help): Partition type p primary (0 primary, 0 extended, 4 free) e extended (container for logical partitions) -Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Last sector, +sectors or +size{K,M,G,T,P} (2048-102399, default 102399): +Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Last sector, +/-sectors or +/-size{K,M,G,T,P} (2048-102399, default 102399): Created a new <removed>. Command (m for help): Partition type p primary (1 primary, 0 extended, 3 free) e extended (container for logical partitions) -Select (default p): Partition number (2-4, default 2): First sector (22528-102399, default 22528): Last sector, +sectors or +size{K,M,G,T,P} (22528-102399, default 102399): +Select (default p): Partition number (2-4, default 2): First sector (22528-102399, default 22528): Last sector, +/-sectors or +/-size{K,M,G,T,P} (22528-102399, default 102399): Created a new <removed>. Command (m for help): Partition type p primary (2 primary, 0 extended, 2 free) e extended (container for logical partitions) -Select (default p): Partition number (3,4, default 3): First sector (43008-102399, default 43008): Last sector, +sectors or +size{K,M,G,T,P} (43008-102399, default 102399): +Select (default p): Partition number (3,4, default 3): First sector (43008-102399, default 43008): Last sector, +/-sectors or +/-size{K,M,G,T,P} (43008-102399, default 102399): Created a new <removed>. Command (m for help): Partition type @@ -30,25 +30,26 @@ Command (m for help): Partition type e extended (container for logical partitions) Select (default e): Selected partition 4 -First sector (63488-102399, default 63488): Last sector, +sectors or +size{K,M,G,T,P} (63488-102399, default 102399): +First sector (63488-102399, default 63488): Last sector, +/-sectors or +/-size{K,M,G,T,P} (63488-102399, default 102399): Created a new <removed>. Command (m for help): All primary partitions are in use. Adding logical partition 5 -First sector (65536-102399, default 65536): Last sector, +sectors or +size{K,M,G,T,P} (65536-102399, default 102399): +First sector (65536-102399, default 65536): Last sector, +/-sectors or +/-size{K,M,G,T,P} (65536-102399, default 102399): Created a new <removed>. Command (m for help): All primary partitions are in use. Adding logical partition 6 -First sector (77824-102399, default 77824): Last sector, +sectors or +size{K,M,G,T,P} (77824-102399, default 102399): +First sector (77824-102399, default 77824): Last sector, +/-sectors or +/-size{K,M,G,T,P} (77824-102399, default 102399): Created a new <removed>. Command (m for help): All primary partitions are in use. Adding logical partition 7 -First sector (90112-102399, default 90112): Last sector, +sectors or +size{K,M,G,T,P} (90112-102399, default 102399): +First sector (90112-102399, default 90112): Last sector, +/-sectors or +/-size{K,M,G,T,P} (90112-102399, default 102399): Created a new <removed>. Command (m for help): Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/fdisk/gpt-resize b/tests/expected/fdisk/gpt-resize index 239213c2a..0b3c25a27 100644 --- a/tests/expected/fdisk/gpt-resize +++ b/tests/expected/fdisk/gpt-resize @@ -28,7 +28,7 @@ Be careful before using the write command. GPT PMBR size mismatch (20479 != 40959) will be corrected by write. The backup GPT table is not on the end of the device. This problem will be corrected by write. -Command (m for help): Partition number (2-128, default 2): First sector (20447-40926, default 20480): Last sector, +sectors or +size{K,M,G,T,P} (20480-40926, default 40926): +Command (m for help): Partition number (2-128, default 2): First sector (20447-40926, default 20480): Last sector, +/-sectors or +/-size{K,M,G,T,P} (20480-40926, default 40926): Created a new <removed>. Command (m for help): The partition table has been altered. diff --git a/tests/expected/fdisk/sunlabel b/tests/expected/fdisk/sunlabel index 9d294f30d..47b5e756b 100644 --- a/tests/expected/fdisk/sunlabel +++ b/tests/expected/fdisk/sunlabel @@ -59,7 +59,7 @@ Changes will remain in memory only, until you decide to write them. Be careful before using the write command. -Command (m for help): Partition number (2-8, default 2): First cylinder (128-325, default 128): Last cylinder or +cylinders or +size{K,M,G,T,P} (128-325, default 325): +Command (m for help): Partition number (2-8, default 2): First cylinder (128-325, default 128): Last cylinder or +/-cylinders or +/-size{K,M,G,T,P} (128-325, default 325): Created a new <removed>. Command (m for help): The partition table has been altered. diff --git a/tests/expected/libmount/tabfiles-parse-mountinfo-nosrc b/tests/expected/libmount/tabfiles-parse-mountinfo-nosrc new file mode 100644 index 000000000..3d44ef60c --- /dev/null +++ b/tests/expected/libmount/tabfiles-parse-mountinfo-nosrc @@ -0,0 +1,78 @@ +------ fs: +source: /proc +target: /proc +fstype: proc +optstr: rw,relatime +VFS-optstr: rw,relatime +FS-opstr: rw +root: / +id: 15 +parent: 20 +devno: 0:3 +------ fs: +source: /sys +target: /sys +fstype: sysfs +optstr: rw,relatime +VFS-optstr: rw,relatime +FS-opstr: rw +root: / +id: 16 +parent: 20 +devno: 0:15 +------ fs: +source: udev +target: /dev +fstype: devtmpfs +optstr: rw,relatime,size=1983516k,nr_inodes=495879,mode=755 +VFS-optstr: rw,relatime +FS-opstr: rw,size=1983516k,nr_inodes=495879,mode=755 +root: / +id: 17 +parent: 20 +devno: 0:5 +------ fs: +source: devpts +target: /dev/pts +fstype: devpts +optstr: rw,relatime,gid=5,mode=620,ptmxmode=000 +VFS-optstr: rw,relatime +FS-opstr: rw,gid=5,mode=620,ptmxmode=000 +root: / +id: 18 +parent: 17 +devno: 0:10 +------ fs: +source: tmpfs +target: /dev/shm +fstype: tmpfs +optstr: rw,relatime +VFS-optstr: rw,relatime +FS-opstr: rw +root: / +id: 19 +parent: 17 +devno: 0:16 +------ fs: +source: /dev/sda4 +target: / +fstype: ext3 +optstr: rw,noatime,errors=continue,user_xattr,acl,barrier=0,data=ordered +VFS-optstr: rw,noatime +FS-opstr: rw,errors=continue,user_xattr,acl,barrier=0,data=ordered +root: / +id: 20 +parent: 1 +devno: 8:4 +------ fs: +source: +target: /mnt/test +fstype: tmpfs +optstr: rw,relatime +VFS-optstr: rw,relatime +FS-opstr: rw +optional-fields: 'shared:212' +root: / +id: 21 +parent: 20 +devno: 0:53 diff --git a/tests/expected/lsblk/lsblk-simple-lvm-basic b/tests/expected/lsblk/lsblk-simple-lvm-basic new file mode 100644 index 000000000..0413be798 --- /dev/null +++ b/tests/expected/lsblk/lsblk-simple-lvm-basic @@ -0,0 +1,22 @@ +NAME KNAME MAJ:MIN RM SIZE TYPE MOUNTPOINT +loop0 loop0 7:0 0 10M loop +`-vg_foo.4059-lv_foo.4059 dm-0 253:0 0 32M lvm +loop1 loop1 7:1 0 10M loop +`-vg_foo.4059-lv_foo.4059 dm-0 253:0 0 32M lvm +loop2 loop2 7:2 0 10M loop +`-vg_foo.4059-lv_foo.4059 dm-0 253:0 0 32M lvm +loop3 loop3 7:3 0 10M loop +`-vg_foo.4059-lv_foo.4059 dm-0 253:0 0 32M lvm +sda sda 8:0 0 223.6G disk +|-sda1 sda1 8:1 0 200M part /boot/efi +|-sda2 sda2 8:2 0 200M part /boot +|-sda3 sda3 8:3 0 130.3G part +|-sda4 sda4 8:4 0 50G part / +|-sda5 sda5 8:5 0 35.1G part +`-sda6 sda6 8:6 0 7.8G part +sdb sdb 8:16 0 74.5G disk +`-sdb1 sdb1 8:17 0 74.5G part /home/archive +nvme0n1 nvme0n1 259:0 0 223.6G disk +|-nvme0n1p1 nvme0n1p1 259:1 0 7.8G part +|-nvme0n1p2 nvme0n1p2 259:2 0 200G part /home +`-nvme0n1p3 nvme0n1p3 259:3 0 15.8G part /home/test diff --git a/tests/expected/lsblk/lsblk-simple-lvm-discard b/tests/expected/lsblk/lsblk-simple-lvm-discard new file mode 100644 index 000000000..4eb67630a --- /dev/null +++ b/tests/expected/lsblk/lsblk-simple-lvm-discard @@ -0,0 +1,22 @@ +NAME DISC-ALN DISC-GRAN DISC-MAX DISC-ZERO +loop0 0 4K 4G 0 +`-vg_foo.4059-lv_foo.4059 0 4K 4G 0 +loop1 0 4K 4G 0 +`-vg_foo.4059-lv_foo.4059 0 4K 4G 0 +loop2 0 4K 4G 0 +`-vg_foo.4059-lv_foo.4059 0 4K 4G 0 +loop3 0 4K 4G 0 +`-vg_foo.4059-lv_foo.4059 0 4K 4G 0 +sda 0 512B 2G 0 +|-sda1 0 512B 2G 0 +|-sda2 0 512B 2G 0 +|-sda3 0 512B 2G 0 +|-sda4 0 512B 2G 0 +|-sda5 0 512B 2G 0 +`-sda6 0 512B 2G 0 +sdb 0 0B 0B 0 +`-sdb1 0 0B 0B 0 +nvme0n1 0 512B 2T 0 +|-nvme0n1p1 0 512B 2T 0 +|-nvme0n1p2 0 512B 2T 0 +`-nvme0n1p3 0 512B 2T 0 diff --git a/tests/expected/lsblk/lsblk-simple-lvm-rw b/tests/expected/lsblk/lsblk-simple-lvm-rw new file mode 100644 index 000000000..8dcf580f2 --- /dev/null +++ b/tests/expected/lsblk/lsblk-simple-lvm-rw @@ -0,0 +1,22 @@ +NAME RA WSAME +loop0 128 0B +`-vg_foo.4059-lv_foo.4059 128 0B +loop1 128 0B +`-vg_foo.4059-lv_foo.4059 128 0B +loop2 128 0B +`-vg_foo.4059-lv_foo.4059 128 0B +loop3 128 0B +`-vg_foo.4059-lv_foo.4059 128 0B +sda 128 0B +|-sda1 128 0B +|-sda2 128 0B +|-sda3 128 0B +|-sda4 128 0B +|-sda5 128 0B +`-sda6 128 0B +sdb 128 0B +`-sdb1 128 0B +nvme0n1 128 0B +|-nvme0n1p1 128 0B +|-nvme0n1p2 128 0B +`-nvme0n1p3 128 0B diff --git a/tests/expected/lsblk/lsblk-simple-lvm-state b/tests/expected/lsblk/lsblk-simple-lvm-state new file mode 100644 index 000000000..000ed44e8 --- /dev/null +++ b/tests/expected/lsblk/lsblk-simple-lvm-state @@ -0,0 +1,22 @@ +NAME RO RM HOTPLUG RAND STATE ROTA TYPE PKNAME SCHED +loop0 0 0 0 0 1 loop mq-deadline +`-vg_foo.4059-lv_foo.4059 0 0 0 0 running 1 lvm loop0 +loop1 0 0 0 0 1 loop mq-deadline +`-vg_foo.4059-lv_foo.4059 0 0 0 0 running 1 lvm loop1 +loop2 0 0 0 0 1 loop mq-deadline +`-vg_foo.4059-lv_foo.4059 0 0 0 0 running 1 lvm loop2 +loop3 0 0 0 0 1 loop mq-deadline +`-vg_foo.4059-lv_foo.4059 0 0 0 0 running 1 lvm loop3 +sda 0 0 0 0 running 0 disk cfq +|-sda1 0 0 0 0 0 part sda cfq +|-sda2 0 0 0 0 0 part sda cfq +|-sda3 0 0 0 0 0 part sda cfq +|-sda4 0 0 0 0 0 part sda cfq +|-sda5 0 0 0 0 0 part sda cfq +`-sda6 0 0 0 0 0 part sda cfq +sdb 0 0 0 1 running 1 disk cfq +`-sdb1 0 0 0 1 1 part sdb cfq +nvme0n1 0 0 0 0 live 0 disk none +|-nvme0n1p1 0 0 0 0 0 part nvme0n1 none +|-nvme0n1p2 0 0 0 0 0 part nvme0n1 none +`-nvme0n1p3 0 0 0 0 0 part nvme0n1 none diff --git a/tests/expected/lsblk/lsblk-simple-lvm-topo b/tests/expected/lsblk/lsblk-simple-lvm-topo new file mode 100644 index 000000000..3937da304 --- /dev/null +++ b/tests/expected/lsblk/lsblk-simple-lvm-topo @@ -0,0 +1,22 @@ +NAME SIZE ALIGNMENT MIN-IO OPT-IO PHY-SEC LOG-SEC RQ-SIZE +loop0 10M 0 512 0 512 512 256 +`-vg_foo.4059-lv_foo.4059 32M 0 512 0 512 512 128 +loop1 10M 0 512 0 512 512 256 +`-vg_foo.4059-lv_foo.4059 32M 0 512 0 512 512 128 +loop2 10M 0 512 0 512 512 256 +`-vg_foo.4059-lv_foo.4059 32M 0 512 0 512 512 128 +loop3 10M 0 512 0 512 512 256 +`-vg_foo.4059-lv_foo.4059 32M 0 512 0 512 512 128 +sda 223.6G 0 512 0 512 512 128 +|-sda1 200M 0 512 0 512 512 128 +|-sda2 200M 0 512 0 512 512 128 +|-sda3 130.3G 0 512 0 512 512 128 +|-sda4 50G 0 512 0 512 512 128 +|-sda5 35.1G 0 512 0 512 512 128 +`-sda6 7.8G 0 512 0 512 512 128 +sdb 74.5G 0 512 0 512 512 128 +`-sdb1 74.5G 0 512 0 512 512 128 +nvme0n1 223.6G 0 512 0 512 512 1023 +|-nvme0n1p1 7.8G 0 512 0 512 512 1023 +|-nvme0n1p2 200G 0 512 0 512 512 1023 +`-nvme0n1p3 15.8G 0 512 0 512 512 1023 diff --git a/tests/expected/lsblk/lsblk-simple-lvm-vendor b/tests/expected/lsblk/lsblk-simple-lvm-vendor new file mode 100644 index 000000000..591c703af --- /dev/null +++ b/tests/expected/lsblk/lsblk-simple-lvm-vendor @@ -0,0 +1,22 @@ +NAME MODEL VENDOR REV +loop0 +`-vg_foo.4059-lv_foo.4059 +loop1 +`-vg_foo.4059-lv_foo.4059 +loop2 +`-vg_foo.4059-lv_foo.4059 +loop3 +`-vg_foo.4059-lv_foo.4059 +sda KINGSTON SH103S3 ATA BBF0 +|-sda1 +|-sda2 +|-sda3 +|-sda4 +|-sda5 +`-sda6 +sdb WDC WD800JD-00MS ATA 1E01 +`-sdb1 +nvme0n1 KINGSTON SKC1000240G +|-nvme0n1p1 +|-nvme0n1p2 +`-nvme0n1p3 diff --git a/tests/expected/lsblk/lsblk-simple-lvm-zone b/tests/expected/lsblk/lsblk-simple-lvm-zone new file mode 100644 index 000000000..256a20876 --- /dev/null +++ b/tests/expected/lsblk/lsblk-simple-lvm-zone @@ -0,0 +1,22 @@ +NAME ZONED +loop0 none +`-vg_foo.4059-lv_foo.4059 none +loop1 none +`-vg_foo.4059-lv_foo.4059 none +loop2 none +`-vg_foo.4059-lv_foo.4059 none +loop3 none +`-vg_foo.4059-lv_foo.4059 none +sda none +|-sda1 none +|-sda2 none +|-sda3 none +|-sda4 none +|-sda5 none +`-sda6 none +sdb none +`-sdb1 none +nvme0n1 none +|-nvme0n1p1 none +|-nvme0n1p2 none +`-nvme0n1p3 none diff --git a/tests/expected/lsblk/lsblk-simple-nvme-basic b/tests/expected/lsblk/lsblk-simple-nvme-basic new file mode 100644 index 000000000..c3f483568 --- /dev/null +++ b/tests/expected/lsblk/lsblk-simple-nvme-basic @@ -0,0 +1,14 @@ +NAME KNAME MAJ:MIN RM SIZE TYPE MOUNTPOINT +sda sda 8:0 0 223.6G disk +|-sda1 sda1 8:1 0 200M part /boot/efi +|-sda2 sda2 8:2 0 200M part /boot +|-sda3 sda3 8:3 0 130.3G part +|-sda4 sda4 8:4 0 50G part / +|-sda5 sda5 8:5 0 35.1G part +`-sda6 sda6 8:6 0 7.8G part +sdb sdb 8:16 0 74.5G disk +`-sdb1 sdb1 8:17 0 74.5G part /home/archive +nvme0n1 nvme0n1 259:0 0 223.6G disk +|-nvme0n1p1 nvme0n1p1 259:1 0 7.8G part +|-nvme0n1p2 nvme0n1p2 259:2 0 200G part /home +`-nvme0n1p3 nvme0n1p3 259:3 0 15.8G part /home/test diff --git a/tests/expected/lsblk/lsblk-simple-nvme-discard b/tests/expected/lsblk/lsblk-simple-nvme-discard new file mode 100644 index 000000000..4e03c7ca2 --- /dev/null +++ b/tests/expected/lsblk/lsblk-simple-nvme-discard @@ -0,0 +1,14 @@ +NAME DISC-ALN DISC-GRAN DISC-MAX DISC-ZERO +sda 0 512B 2G 0 +|-sda1 0 512B 2G 0 +|-sda2 0 512B 2G 0 +|-sda3 0 512B 2G 0 +|-sda4 0 512B 2G 0 +|-sda5 0 512B 2G 0 +`-sda6 0 512B 2G 0 +sdb 0 0B 0B 0 +`-sdb1 0 0B 0B 0 +nvme0n1 0 512B 2T 0 +|-nvme0n1p1 0 512B 2T 0 +|-nvme0n1p2 0 512B 2T 0 +`-nvme0n1p3 0 512B 2T 0 diff --git a/tests/expected/lsblk/lsblk-simple-nvme-rw b/tests/expected/lsblk/lsblk-simple-nvme-rw new file mode 100644 index 000000000..a5eb877bb --- /dev/null +++ b/tests/expected/lsblk/lsblk-simple-nvme-rw @@ -0,0 +1,14 @@ +NAME RA WSAME +sda 128 0B +|-sda1 128 0B +|-sda2 128 0B +|-sda3 128 0B +|-sda4 128 0B +|-sda5 128 0B +`-sda6 128 0B +sdb 128 0B +`-sdb1 128 0B +nvme0n1 128 0B +|-nvme0n1p1 128 0B +|-nvme0n1p2 128 0B +`-nvme0n1p3 128 0B diff --git a/tests/expected/lsblk/lsblk-simple-nvme-state b/tests/expected/lsblk/lsblk-simple-nvme-state new file mode 100644 index 000000000..1efdf14db --- /dev/null +++ b/tests/expected/lsblk/lsblk-simple-nvme-state @@ -0,0 +1,14 @@ +NAME RO RM HOTPLUG RAND STATE ROTA TYPE PKNAME SCHED +sda 0 0 0 0 running 0 disk cfq +|-sda1 0 0 0 0 0 part sda cfq +|-sda2 0 0 0 0 0 part sda cfq +|-sda3 0 0 0 0 0 part sda cfq +|-sda4 0 0 0 0 0 part sda cfq +|-sda5 0 0 0 0 0 part sda cfq +`-sda6 0 0 0 0 0 part sda cfq +sdb 0 0 0 1 running 1 disk cfq +`-sdb1 0 0 0 1 1 part sdb cfq +nvme0n1 0 0 0 0 live 0 disk none +|-nvme0n1p1 0 0 0 0 0 part nvme0n1 none +|-nvme0n1p2 0 0 0 0 0 part nvme0n1 none +`-nvme0n1p3 0 0 0 0 0 part nvme0n1 none diff --git a/tests/expected/lsblk/lsblk-simple-nvme-topo b/tests/expected/lsblk/lsblk-simple-nvme-topo new file mode 100644 index 000000000..87b0fa5ef --- /dev/null +++ b/tests/expected/lsblk/lsblk-simple-nvme-topo @@ -0,0 +1,14 @@ +NAME SIZE ALIGNMENT MIN-IO OPT-IO PHY-SEC LOG-SEC RQ-SIZE +sda 223.6G 0 512 0 512 512 128 +|-sda1 200M 0 512 0 512 512 128 +|-sda2 200M 0 512 0 512 512 128 +|-sda3 130.3G 0 512 0 512 512 128 +|-sda4 50G 0 512 0 512 512 128 +|-sda5 35.1G 0 512 0 512 512 128 +`-sda6 7.8G 0 512 0 512 512 128 +sdb 74.5G 0 512 0 512 512 128 +`-sdb1 74.5G 0 512 0 512 512 128 +nvme0n1 223.6G 0 512 0 512 512 1023 +|-nvme0n1p1 7.8G 0 512 0 512 512 1023 +|-nvme0n1p2 200G 0 512 0 512 512 1023 +`-nvme0n1p3 15.8G 0 512 0 512 512 1023 diff --git a/tests/expected/lsblk/lsblk-simple-nvme-vendor b/tests/expected/lsblk/lsblk-simple-nvme-vendor new file mode 100644 index 000000000..69e972a31 --- /dev/null +++ b/tests/expected/lsblk/lsblk-simple-nvme-vendor @@ -0,0 +1,14 @@ +NAME MODEL VENDOR REV +sda KINGSTON SH103S3 ATA BBF0 +|-sda1 +|-sda2 +|-sda3 +|-sda4 +|-sda5 +`-sda6 +sdb WDC WD800JD-00MS ATA 1E01 +`-sdb1 +nvme0n1 KINGSTON SKC1000240G +|-nvme0n1p1 +|-nvme0n1p2 +`-nvme0n1p3 diff --git a/tests/expected/lsblk/lsblk-simple-nvme-zone b/tests/expected/lsblk/lsblk-simple-nvme-zone new file mode 100644 index 000000000..bba9ba997 --- /dev/null +++ b/tests/expected/lsblk/lsblk-simple-nvme-zone @@ -0,0 +1,14 @@ +NAME ZONED +sda none +|-sda1 none +|-sda2 none +|-sda3 none +|-sda4 none +|-sda5 none +`-sda6 none +sdb none +`-sdb1 none +nvme0n1 none +|-nvme0n1p1 none +|-nvme0n1p2 none +`-nvme0n1p3 none diff --git a/tests/expected/lscpu/lscpu-vbox-win b/tests/expected/lscpu/lscpu-vbox-win index 34f61302e..701a57882 100644 --- a/tests/expected/lscpu/lscpu-vbox-win +++ b/tests/expected/lscpu/lscpu-vbox-win @@ -1,4 +1,5 @@ CPU op-mode(s): 32-bit, 64-bit +Address sizes: 36 bits physical, 48 bits virtual CPU(s): 2 On-line CPU(s) list: 0,1 Thread(s) per core: 1 diff --git a/tests/expected/lscpu/lscpu-x86_64-64cpu b/tests/expected/lscpu/lscpu-x86_64-64cpu index 432ecaf84..91809241c 100644 --- a/tests/expected/lscpu/lscpu-x86_64-64cpu +++ b/tests/expected/lscpu/lscpu-x86_64-64cpu @@ -1,4 +1,5 @@ CPU op-mode(s): 32-bit, 64-bit +Address sizes: 44 bits physical, 48 bits virtual CPU(s): 64 On-line CPU(s) list: 0-63 Thread(s) per core: 2 diff --git a/tests/expected/lscpu/lscpu-x86_64-dell_e4310 b/tests/expected/lscpu/lscpu-x86_64-dell_e4310 index 631887e3a..0eca1440c 100644 --- a/tests/expected/lscpu/lscpu-x86_64-dell_e4310 +++ b/tests/expected/lscpu/lscpu-x86_64-dell_e4310 @@ -1,4 +1,5 @@ CPU op-mode(s): 32-bit, 64-bit +Address sizes: 36 bits physical, 48 bits virtual CPU(s): 4 On-line CPU(s) list: 0-3 Thread(s) per core: 2 diff --git a/tests/expected/sfdisk/dos-activate b/tests/expected/sfdisk/dos-activate index 72f2d25f5..59f460d92 100644 --- a/tests/expected/sfdisk/dos-activate +++ b/tests/expected/sfdisk/dos-activate @@ -4,6 +4,7 @@ The partition table has been altered. Calling ioctl() to re-read partition table. Syncing disks. Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/dos-dump-gaps b/tests/expected/sfdisk/dos-dump-gaps index e481925d4..51ad60916 100644 --- a/tests/expected/sfdisk/dos-dump-gaps +++ b/tests/expected/sfdisk/dos-dump-gaps @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/dos-dump-old b/tests/expected/sfdisk/dos-dump-old index 5940087a9..06bbf281e 100644 --- a/tests/expected/sfdisk/dos-dump-old +++ b/tests/expected/sfdisk/dos-dump-old @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/dos-explicit-size b/tests/expected/sfdisk/dos-explicit-size index fd0156344..10e07384b 100644 --- a/tests/expected/sfdisk/dos-explicit-size +++ b/tests/expected/sfdisk/dos-explicit-size @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/dos-read-dump b/tests/expected/sfdisk/dos-read-dump index ebc6fb408..a25429c4b 100644 --- a/tests/expected/sfdisk/dos-read-dump +++ b/tests/expected/sfdisk/dos-read-dump @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/dos-read-dump-case b/tests/expected/sfdisk/dos-read-dump-case index 81df50701..a6fc3f257 100644 --- a/tests/expected/sfdisk/dos-read-dump-case +++ b/tests/expected/sfdisk/dos-read-dump-case @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/dos-reduce-empty-extended b/tests/expected/sfdisk/dos-reduce-empty-extended index 7c6f8beab..f37cdcf36 100644 --- a/tests/expected/sfdisk/dos-reduce-empty-extended +++ b/tests/expected/sfdisk/dos-reduce-empty-extended @@ -1,4 +1,5 @@ Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/dos-resize b/tests/expected/sfdisk/dos-resize index c82d15fb3..a39b940f1 100644 --- a/tests/expected/sfdisk/dos-resize +++ b/tests/expected/sfdisk/dos-resize @@ -1,4 +1,5 @@ Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/dos-resize-empty-extended b/tests/expected/sfdisk/dos-resize-empty-extended index 4a2759c7c..14cecbe05 100644 --- a/tests/expected/sfdisk/dos-resize-empty-extended +++ b/tests/expected/sfdisk/dos-resize-empty-extended @@ -1,4 +1,5 @@ Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/dos-resize-extended b/tests/expected/sfdisk/dos-resize-extended index 6b7b099e7..90dce82b6 100644 --- a/tests/expected/sfdisk/dos-resize-extended +++ b/tests/expected/sfdisk/dos-resize-extended @@ -1,4 +1,5 @@ Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/dos-resize-logical b/tests/expected/sfdisk/dos-resize-logical index 9ceb9a327..e3b805af0 100644 --- a/tests/expected/sfdisk/dos-resize-logical +++ b/tests/expected/sfdisk/dos-resize-logical @@ -1,4 +1,5 @@ Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes @@ -26,7 +27,7 @@ Device Boot Start End Sectors Size Id Type <removed>3 6144 8191 2048 1M 83 Linux <removed>4 8192 28671 20480 10M 5 Extended <removed>5 10240 12287 2048 1M 83 Linux -<removed>6 14336 26623 12288 6M 83 Linux +<removed>6 14336 28671 14336 7M 83 Linux The partition table has been altered. Calling ioctl() to re-read partition table. diff --git a/tests/expected/sfdisk/dos-simple-commas b/tests/expected/sfdisk/dos-simple-commas index e0b3e3734..ea69e0dc9 100644 --- a/tests/expected/sfdisk/dos-simple-commas +++ b/tests/expected/sfdisk/dos-simple-commas @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/dos-simple-space b/tests/expected/sfdisk/dos-simple-space index e690ba255..858ddc9ea 100644 --- a/tests/expected/sfdisk/dos-simple-space +++ b/tests/expected/sfdisk/dos-simple-space @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/gpt-all-defaults b/tests/expected/sfdisk/gpt-all-defaults index 048ae3a9a..b654dd7bc 100644 --- a/tests/expected/sfdisk/gpt-all-defaults +++ b/tests/expected/sfdisk/gpt-all-defaults @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/gpt-read-dump b/tests/expected/sfdisk/gpt-read-dump index a836ea93f..60d992222 100644 --- a/tests/expected/sfdisk/gpt-read-dump +++ b/tests/expected/sfdisk/gpt-read-dump @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes @@ -29,6 +30,7 @@ The partition table has been altered. Calling ioctl() to re-read partition table. Syncing disks. Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/gpt-reorder b/tests/expected/sfdisk/gpt-reorder index afc71165b..ff0ef0743 100644 --- a/tests/expected/sfdisk/gpt-reorder +++ b/tests/expected/sfdisk/gpt-reorder @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes @@ -35,6 +36,7 @@ The partition table has been altered. Calling ioctl() to re-read partition table. Syncing disks. Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/gpt-resize b/tests/expected/sfdisk/gpt-resize index c9385c3c2..6e9d2e5c5 100644 --- a/tests/expected/sfdisk/gpt-resize +++ b/tests/expected/sfdisk/gpt-resize @@ -1,4 +1,5 @@ Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/movedata-down b/tests/expected/sfdisk/movedata-down index 8301de1cc..ae256ad31 100644 --- a/tests/expected/sfdisk/movedata-down +++ b/tests/expected/sfdisk/movedata-down @@ -1,4 +1,5 @@ Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/movedata-non-overlay b/tests/expected/sfdisk/movedata-non-overlay index 3ea1e33e9..733de1520 100644 --- a/tests/expected/sfdisk/movedata-non-overlay +++ b/tests/expected/sfdisk/movedata-non-overlay @@ -1,4 +1,5 @@ Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/movedata-up b/tests/expected/sfdisk/movedata-up index 75d159cc5..de5b175d2 100644 --- a/tests/expected/sfdisk/movedata-up +++ b/tests/expected/sfdisk/movedata-up @@ -1,4 +1,5 @@ Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-dos-0-move-up-absolute b/tests/expected/sfdisk/resize-dos-0-move-up-absolute index 93c0f882d..e1c069fb0 100644 --- a/tests/expected/sfdisk/resize-dos-0-move-up-absolute +++ b/tests/expected/sfdisk/resize-dos-0-move-up-absolute @@ -1,6 +1,7 @@ 3000, Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-dos-1-move-down-absolute b/tests/expected/sfdisk/resize-dos-1-move-down-absolute index 87ee9cad5..da886357a 100644 --- a/tests/expected/sfdisk/resize-dos-1-move-down-absolute +++ b/tests/expected/sfdisk/resize-dos-1-move-down-absolute @@ -1,6 +1,7 @@ 2048, Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-dos-10-down-enlarge b/tests/expected/sfdisk/resize-dos-10-down-enlarge index d8d2accf9..df392d831 100644 --- a/tests/expected/sfdisk/resize-dos-10-down-enlarge +++ b/tests/expected/sfdisk/resize-dos-10-down-enlarge @@ -1,6 +1,7 @@ -10M,+10M,,* Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-dos-11-absolute-move-resize b/tests/expected/sfdisk/resize-dos-11-absolute-move-resize index 6e7b9dbe2..43e6837b6 100644 --- a/tests/expected/sfdisk/resize-dos-11-absolute-move-resize +++ b/tests/expected/sfdisk/resize-dos-11-absolute-move-resize @@ -1,6 +1,7 @@ 2048,10M,L Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-dos-12-reduce-midle b/tests/expected/sfdisk/resize-dos-12-reduce-midle index da52b1663..669fd451b 100644 --- a/tests/expected/sfdisk/resize-dos-12-reduce-midle +++ b/tests/expected/sfdisk/resize-dos-12-reduce-midle @@ -1,6 +1,7 @@ ,-5M Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-dos-13-max-last b/tests/expected/sfdisk/resize-dos-13-max-last index 4afc793a0..3664d88e4 100644 --- a/tests/expected/sfdisk/resize-dos-13-max-last +++ b/tests/expected/sfdisk/resize-dos-13-max-last @@ -1,6 +1,7 @@ -5M,+ Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-dos-2-move-up-relative b/tests/expected/sfdisk/resize-dos-2-move-up-relative index 7ec898197..75a95b175 100644 --- a/tests/expected/sfdisk/resize-dos-2-move-up-relative +++ b/tests/expected/sfdisk/resize-dos-2-move-up-relative @@ -1,6 +1,7 @@ +1M, Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-dos-3-move-down-relative b/tests/expected/sfdisk/resize-dos-3-move-down-relative index 7053b3916..b3816e0e1 100644 --- a/tests/expected/sfdisk/resize-dos-3-move-down-relative +++ b/tests/expected/sfdisk/resize-dos-3-move-down-relative @@ -1,6 +1,7 @@ -1M, Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-dos-4-enlarge-absolute b/tests/expected/sfdisk/resize-dos-4-enlarge-absolute index cb603dc5c..0c18f9fb6 100644 --- a/tests/expected/sfdisk/resize-dos-4-enlarge-absolute +++ b/tests/expected/sfdisk/resize-dos-4-enlarge-absolute @@ -1,6 +1,7 @@ -,15M Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-dos-5-reduce-absolute b/tests/expected/sfdisk/resize-dos-5-reduce-absolute index 55afbed9c..557875d9e 100644 --- a/tests/expected/sfdisk/resize-dos-5-reduce-absolute +++ b/tests/expected/sfdisk/resize-dos-5-reduce-absolute @@ -1,6 +1,7 @@ ,5M, Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-dos-6-enlarge-relative b/tests/expected/sfdisk/resize-dos-6-enlarge-relative index ee0049070..528d025a0 100644 --- a/tests/expected/sfdisk/resize-dos-6-enlarge-relative +++ b/tests/expected/sfdisk/resize-dos-6-enlarge-relative @@ -1,6 +1,7 @@ , +10M Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-dos-7-reduce-relative b/tests/expected/sfdisk/resize-dos-7-reduce-relative index 8bb794e86..6a6fa0c50 100644 --- a/tests/expected/sfdisk/resize-dos-7-reduce-relative +++ b/tests/expected/sfdisk/resize-dos-7-reduce-relative @@ -1,6 +1,7 @@ , -10M Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-dos-8-enlarge-all b/tests/expected/sfdisk/resize-dos-8-enlarge-all index 50805522f..2f6b3fb67 100644 --- a/tests/expected/sfdisk/resize-dos-8-enlarge-all +++ b/tests/expected/sfdisk/resize-dos-8-enlarge-all @@ -1,6 +1,7 @@ ,+ Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-dos-9-up-preduce b/tests/expected/sfdisk/resize-dos-9-up-preduce index 17d24ea4e..2ca6f3b10 100644 --- a/tests/expected/sfdisk/resize-dos-9-up-preduce +++ b/tests/expected/sfdisk/resize-dos-9-up-preduce @@ -1,6 +1,7 @@ +10M,-10M Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-dos-unsorted b/tests/expected/sfdisk/resize-dos-unsorted index 21dbe5b12..49133bb12 100644 --- a/tests/expected/sfdisk/resize-dos-unsorted +++ b/tests/expected/sfdisk/resize-dos-unsorted @@ -1,4 +1,5 @@ Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes @@ -34,6 +35,7 @@ The partition table has been altered. Calling ioctl() to re-read partition table. Syncing disks. Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-gpt-0-move-up-absolute b/tests/expected/sfdisk/resize-gpt-0-move-up-absolute index 041e78e4a..230841d7c 100644 --- a/tests/expected/sfdisk/resize-gpt-0-move-up-absolute +++ b/tests/expected/sfdisk/resize-gpt-0-move-up-absolute @@ -1,6 +1,7 @@ 3000, Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-gpt-1-move-down-absolute b/tests/expected/sfdisk/resize-gpt-1-move-down-absolute index 24a9c9f1e..de2a8718b 100644 --- a/tests/expected/sfdisk/resize-gpt-1-move-down-absolute +++ b/tests/expected/sfdisk/resize-gpt-1-move-down-absolute @@ -1,6 +1,7 @@ 2048, Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-gpt-10-down-enlarge b/tests/expected/sfdisk/resize-gpt-10-down-enlarge index 5d6de25b6..037d0ab23 100644 --- a/tests/expected/sfdisk/resize-gpt-10-down-enlarge +++ b/tests/expected/sfdisk/resize-gpt-10-down-enlarge @@ -1,6 +1,7 @@ -10M,+10M,,* Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize b/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize index ea6342a57..351e85845 100644 --- a/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize +++ b/tests/expected/sfdisk/resize-gpt-11-absolute-move-resize @@ -1,6 +1,7 @@ 2048,10M,L Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-gpt-12-reduce-midle b/tests/expected/sfdisk/resize-gpt-12-reduce-midle index 20bd555d2..683cedee9 100644 --- a/tests/expected/sfdisk/resize-gpt-12-reduce-midle +++ b/tests/expected/sfdisk/resize-gpt-12-reduce-midle @@ -1,6 +1,7 @@ ,-5M Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-gpt-13-max-last b/tests/expected/sfdisk/resize-gpt-13-max-last index bb6f3e171..b0483f7a6 100644 --- a/tests/expected/sfdisk/resize-gpt-13-max-last +++ b/tests/expected/sfdisk/resize-gpt-13-max-last @@ -1,6 +1,7 @@ -5M,+ Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-gpt-2-move-up-relative b/tests/expected/sfdisk/resize-gpt-2-move-up-relative index 5ff108f08..7669dab5b 100644 --- a/tests/expected/sfdisk/resize-gpt-2-move-up-relative +++ b/tests/expected/sfdisk/resize-gpt-2-move-up-relative @@ -1,6 +1,7 @@ +1M, Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-gpt-3-move-down-relative b/tests/expected/sfdisk/resize-gpt-3-move-down-relative index 100a9cf65..c8aa63ac8 100644 --- a/tests/expected/sfdisk/resize-gpt-3-move-down-relative +++ b/tests/expected/sfdisk/resize-gpt-3-move-down-relative @@ -1,6 +1,7 @@ -1M, Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute b/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute index f98403457..832e112bc 100644 --- a/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute +++ b/tests/expected/sfdisk/resize-gpt-4-enlarge-absolute @@ -1,6 +1,7 @@ -,15M Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-gpt-5-reduce-absolute b/tests/expected/sfdisk/resize-gpt-5-reduce-absolute index 9c4a03454..b21418342 100644 --- a/tests/expected/sfdisk/resize-gpt-5-reduce-absolute +++ b/tests/expected/sfdisk/resize-gpt-5-reduce-absolute @@ -1,6 +1,7 @@ ,5M, Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-gpt-6-enlarge-relative b/tests/expected/sfdisk/resize-gpt-6-enlarge-relative index 897732319..a9090e22f 100644 --- a/tests/expected/sfdisk/resize-gpt-6-enlarge-relative +++ b/tests/expected/sfdisk/resize-gpt-6-enlarge-relative @@ -1,6 +1,7 @@ , +10M Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-gpt-7-reduce-relative b/tests/expected/sfdisk/resize-gpt-7-reduce-relative index ec85e1b3a..7e391cdad 100644 --- a/tests/expected/sfdisk/resize-gpt-7-reduce-relative +++ b/tests/expected/sfdisk/resize-gpt-7-reduce-relative @@ -1,6 +1,7 @@ , -10M Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-gpt-8-enlarge-all b/tests/expected/sfdisk/resize-gpt-8-enlarge-all index f7a569cc7..d0c4c5e6f 100644 --- a/tests/expected/sfdisk/resize-gpt-8-enlarge-all +++ b/tests/expected/sfdisk/resize-gpt-8-enlarge-all @@ -1,6 +1,7 @@ ,+ Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/resize-gpt-9-up-preduce b/tests/expected/sfdisk/resize-gpt-9-up-preduce index 6fab84fdd..16d348a51 100644 --- a/tests/expected/sfdisk/resize-gpt-9-up-preduce +++ b/tests/expected/sfdisk/resize-gpt-9-up-preduce @@ -1,6 +1,7 @@ +10M,-10M Disk <removed>: 100 MiB, 104857600 bytes, 204800 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/script-broken-1 b/tests/expected/sfdisk/script-broken-1 index 2dcc36ba3..6441c122f 100644 --- a/tests/expected/sfdisk/script-broken-1 +++ b/tests/expected/sfdisk/script-broken-1 @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/script-broken-2 b/tests/expected/sfdisk/script-broken-2 index 2dcc36ba3..6441c122f 100644 --- a/tests/expected/sfdisk/script-broken-2 +++ b/tests/expected/sfdisk/script-broken-2 @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/script-broken-3 b/tests/expected/sfdisk/script-broken-3 index 2dcc36ba3..6441c122f 100644 --- a/tests/expected/sfdisk/script-broken-3 +++ b/tests/expected/sfdisk/script-broken-3 @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/script-broken-4 b/tests/expected/sfdisk/script-broken-4 index 2dcc36ba3..6441c122f 100644 --- a/tests/expected/sfdisk/script-broken-4 +++ b/tests/expected/sfdisk/script-broken-4 @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/script-broken-5 b/tests/expected/sfdisk/script-broken-5 index 2dcc36ba3..6441c122f 100644 --- a/tests/expected/sfdisk/script-broken-5 +++ b/tests/expected/sfdisk/script-broken-5 @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/script-quotes b/tests/expected/sfdisk/script-quotes index 65f390554..e38b8395c 100644 --- a/tests/expected/sfdisk/script-quotes +++ b/tests/expected/sfdisk/script-quotes @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes @@ -29,6 +30,7 @@ The partition table has been altered. Calling ioctl() to re-read partition table. Syncing disks. Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/script-separator b/tests/expected/sfdisk/script-separator index e861cc07c..db2f2c423 100644 --- a/tests/expected/sfdisk/script-separator +++ b/tests/expected/sfdisk/script-separator @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes @@ -29,6 +30,7 @@ The partition table has been altered. Calling ioctl() to re-read partition table. Syncing disks. Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/script-type-and-id b/tests/expected/sfdisk/script-type-and-id index e04ee51ab..c834f2290 100644 --- a/tests/expected/sfdisk/script-type-and-id +++ b/tests/expected/sfdisk/script-type-and-id @@ -1,6 +1,7 @@ Checking that no-one is using this disk right now ... OK Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes @@ -29,6 +30,7 @@ The partition table has been altered. Calling ioctl() to re-read partition table. Syncing disks. Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/wipe-fs-to-dos b/tests/expected/sfdisk/wipe-fs-to-dos index f87eb67be..c4b6cd808 100644 --- a/tests/expected/sfdisk/wipe-fs-to-dos +++ b/tests/expected/sfdisk/wipe-fs-to-dos @@ -6,6 +6,7 @@ The old swap signature will be removed by a write command. Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/wipe-gpt-to-dos b/tests/expected/sfdisk/wipe-gpt-to-dos index 90c654f19..1c90e956c 100644 --- a/tests/expected/sfdisk/wipe-gpt-to-dos +++ b/tests/expected/sfdisk/wipe-gpt-to-dos @@ -1,6 +1,7 @@ =====Create GPT================================ Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes @@ -20,6 +21,7 @@ The partition table has been altered. =====Create DOS================================ Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/wipe-gpt-to-dos-auto b/tests/expected/sfdisk/wipe-gpt-to-dos-auto index 8855859f0..ca060a8a6 100644 --- a/tests/expected/sfdisk/wipe-gpt-to-dos-auto +++ b/tests/expected/sfdisk/wipe-gpt-to-dos-auto @@ -1,6 +1,7 @@ =====Create GPT================================ Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes @@ -27,6 +28,7 @@ The partition table has been altered. =====Create DOS================================ Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/sfdisk/wipe-partition b/tests/expected/sfdisk/wipe-partition index eebd8eeb4..17fa2af7e 100644 --- a/tests/expected/sfdisk/wipe-partition +++ b/tests/expected/sfdisk/wipe-partition @@ -1,6 +1,7 @@ =====Create GPT================================ Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes @@ -26,6 +27,7 @@ Syncing disks. =====Create GPT (again)================================ Disk <removed>: 50 MiB, 52428800 bytes, 102400 sectors +Disk model: scsi_debug Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / <removed> bytes diff --git a/tests/expected/uuid/oids b/tests/expected/uuid/oids index 4644848e8..c121cbeee 100644 --- a/tests/expected/uuid/oids +++ b/tests/expected/uuid/oids @@ -1,4 +1,4 @@ 3d813cbb-47fb-32ba-91df-831e1593ac29 5df41881-3aed-3515-88a7-2f4a814cf09e 2ed6657d-e927-568b-95e1-2665a8aea6a2 -fcdc2122-78d2-59f7-91ed-041a561ef652 +fcdc2122-78d2-59f7-b1ed-041a561ef652 diff --git a/tests/run.sh b/tests/run.sh index f40c9f801..3db20dcd8 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -82,7 +82,7 @@ while [ -n "$1" ]; do ;; --parallel=*) paraller_jobs="${1##--parallel=}" - if ! [ "$paraller_jobs" -ge 0 2>/dev/null ]; then + if ! [ "$paraller_jobs" -ge 0 ] 2>/dev/null; then echo "invalid argument '$paraller_jobs' for --parallel=" exit 1 fi diff --git a/tests/ts/blkid/images-fs/bluestore.img.xz b/tests/ts/blkid/images-fs/bluestore.img.xz Binary files differnew file mode 100644 index 000000000..4fd8cbde6 --- /dev/null +++ b/tests/ts/blkid/images-fs/bluestore.img.xz diff --git a/tests/ts/blkid/images-fs/drbd-v08.img.xz b/tests/ts/blkid/images-fs/drbd-v08.img.xz Binary files differnew file mode 100644 index 000000000..2c8db6b50 --- /dev/null +++ b/tests/ts/blkid/images-fs/drbd-v08.img.xz diff --git a/tests/ts/blkid/images-fs/drbd-v09.img.xz b/tests/ts/blkid/images-fs/drbd-v09.img.xz Binary files differnew file mode 100644 index 000000000..798042da8 --- /dev/null +++ b/tests/ts/blkid/images-fs/drbd-v09.img.xz diff --git a/tests/ts/blkid/images-fs/udf-bdr-2.60-nero.img.xz b/tests/ts/blkid/images-fs/udf-bdr-2.60-nero.img.xz Binary files differnew file mode 100644 index 000000000..9fb9a4fec --- /dev/null +++ b/tests/ts/blkid/images-fs/udf-bdr-2.60-nero.img.xz diff --git a/tests/ts/cal/bigyear b/tests/ts/cal/bigyear index d205c3afd..34139fd27 100755 --- a/tests/ts/cal/bigyear +++ b/tests/ts/cal/bigyear @@ -18,7 +18,7 @@ TS_DESC="Year 2147483646" . $TS_TOPDIR/functions.sh ts_init "$*" -ts_check_test_command "$TS_CMD_CAL" +ts_check_test_command "$TS_HELPER_CAL" export TERM=linux diff --git a/tests/ts/cal/month b/tests/ts/cal/month index 9794e90c0..62fd1f928 100755 --- a/tests/ts/cal/month +++ b/tests/ts/cal/month @@ -22,7 +22,7 @@ TS_DESC="month" . $TS_TOPDIR/functions.sh ts_init "$*" -ts_check_test_command "$TS_CMD_CAL" +ts_check_test_command "$TS_HELPER_CAL" export TERM=linux @@ -33,7 +33,7 @@ CAL_TEST_TIME=1516562739 # 21st January 2018 export CAL_TEST_TIME function call_cal { - local testname=$(echo "$2" | sed 's/-//g') + local testname=$(echo "$2" | sed 's/-//g; s/ //g') ts_init_subtest "$testname" ts_log "$1" @@ -63,5 +63,10 @@ call_cal "Gregorian - Sunday-based week with week numbers" -3sw $MYTIME call_cal "Julian - Monday-based week with week numbers" -3mjw $MYTIME call_cal "Julian - Sunday-based week with week numbers" -3sjw $MYTIME +call_cal "Normal span" "-Sn 3" $MYTIME +call_cal "Large span" "-Sn 21" $MYTIME +call_cal "Very Large span" "-Sn 51" $MYTIME +call_cal "Extreme span" "-Sn 201" $MYTIME + ts_finalize diff --git a/tests/ts/cal/sep1752 b/tests/ts/cal/sep1752 index 3128261cd..41c30d40e 100755 --- a/tests/ts/cal/sep1752 +++ b/tests/ts/cal/sep1752 @@ -18,7 +18,7 @@ TS_DESC="September 1752" . $TS_TOPDIR/functions.sh ts_init "$*" -ts_check_test_command "$TS_CMD_CAL" +ts_check_test_command "$TS_HELPER_CAL" export TERM=linux diff --git a/tests/ts/column/files/table-empty-lines b/tests/ts/column/files/table-empty-lines new file mode 100644 index 000000000..9429b4dab --- /dev/null +++ b/tests/ts/column/files/table-empty-lines @@ -0,0 +1,6 @@ + +A B CCC +AA BBB AA +AAA BB C + +AAAA BBBB CCCC diff --git a/tests/ts/column/table b/tests/ts/column/table index 5c89d5eaf..bd1f16f3f 100755 --- a/tests/ts/column/table +++ b/tests/ts/column/table @@ -40,6 +40,14 @@ ts_init_subtest "input-separator-space" $TS_CMD_COLUMN --separator "$(echo -e '\t')" --table $TS_SELF/files/table-sep-space >> $TS_OUTPUT 2>&1 ts_finalize_subtest +ts_init_subtest "empty-lines" +$TS_CMD_COLUMN --table --table-empty-lines $TS_SELF/files/table-empty-lines >> $TS_OUTPUT 2>&1 +ts_finalize_subtest + +ts_init_subtest "noempty-lines" +$TS_CMD_COLUMN --table $TS_SELF/files/table-empty-lines >> $TS_OUTPUT 2>&1 +ts_finalize_subtest + ts_init_subtest "long" $TS_CMD_COLUMN --table $TS_SELF/files/mountinfo >> $TS_OUTPUT 2>&1 ts_finalize_subtest @@ -104,4 +112,8 @@ $TS_CMD_COLUMN --table $TS_SELF/files/mountinfo \ >> $TS_OUTPUT 2>&1 ts_finalize_subtest +ts_init_subtest "empty-column" +printf ':a:b\n' | $TS_CMD_COLUMN --table --separator ':' --output-separator ':' >> $TS_OUTPUT 2>&1 +ts_finalize_subtest + ts_finalize diff --git a/tests/ts/libmount/files/mountinfo_nosrc b/tests/ts/libmount/files/mountinfo_nosrc new file mode 100644 index 000000000..1ef7cf08b --- /dev/null +++ b/tests/ts/libmount/files/mountinfo_nosrc @@ -0,0 +1,7 @@ +15 20 0:3 / /proc rw,relatime - proc /proc rw +16 20 0:15 / /sys rw,relatime - sysfs /sys rw +17 20 0:5 / /dev rw,relatime - devtmpfs udev rw,size=1983516k,nr_inodes=495879,mode=755 +18 17 0:10 / /dev/pts rw,relatime - devpts devpts rw,gid=5,mode=620,ptmxmode=000 +19 17 0:16 / /dev/shm rw,relatime - tmpfs tmpfs rw +20 1 8:4 / / rw,noatime - ext3 /dev/sda4 rw,errors=continue,user_xattr,acl,barrier=0,data=ordered +21 20 0:53 / /mnt/test rw,relatime shared:212 - tmpfs rw diff --git a/tests/ts/libmount/tabfiles b/tests/ts/libmount/tabfiles index a45c28606..ec0eae8e1 100755 --- a/tests/ts/libmount/tabfiles +++ b/tests/ts/libmount/tabfiles @@ -37,6 +37,11 @@ ts_run $TESTPROG --parse "$TS_SELF/files/mountinfo" &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT ts_finalize_subtest +ts_init_subtest "parse-mountinfo-nosrc" +ts_run $TESTPROG --parse "$TS_SELF/files/mountinfo_nosrc" &> $TS_OUTPUT +sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT +ts_finalize_subtest + ts_init_subtest "parse-swaps" ts_run $TESTPROG --parse "$TS_SELF/files/swaps" &> $TS_OUTPUT sed -i -e 's/fs: 0x.*/fs:/g' $TS_OUTPUT diff --git a/tests/ts/lsblk/README b/tests/ts/lsblk/README new file mode 100644 index 000000000..6f937102c --- /dev/null +++ b/tests/ts/lsblk/README @@ -0,0 +1,19 @@ + +Howto add new lsblk test: + +* run mk-input.sh <testname> + +* copy testname.tar.xz file to tests/ts/lsblk/dumps + +* copy lsblk-* files from the tarball to tests/expected/lsblk/ + +* run ./tests/run.sh lsblk + +* git add tests/ts/lsblk/testname.tar.xz + git add tests/expected/lsblk/lsblk-testname* + + +Note that we do not use directly lsblk-* from the tarball. It's better to keep +copy of the files in the tests/expected/lsblk/, because output formatting may +be different in the current version. The version in the tarball is just initial +hint only. diff --git a/tests/ts/lsblk/dumps/simple-lvm.tar.xz b/tests/ts/lsblk/dumps/simple-lvm.tar.xz Binary files differnew file mode 100644 index 000000000..b0c8c34ab --- /dev/null +++ b/tests/ts/lsblk/dumps/simple-lvm.tar.xz diff --git a/tests/ts/lsblk/dumps/simple-nvme.tar.xz b/tests/ts/lsblk/dumps/simple-nvme.tar.xz Binary files differnew file mode 100644 index 000000000..47229b3ab --- /dev/null +++ b/tests/ts/lsblk/dumps/simple-nvme.tar.xz diff --git a/tests/ts/lsblk/lsblk b/tests/ts/lsblk/lsblk new file mode 100755 index 000000000..d51438bc8 --- /dev/null +++ b/tests/ts/lsblk/lsblk @@ -0,0 +1,56 @@ +#!/bin/bash +# +# Copyright (C) 2018 Karel Zak <kzak@redhat.com> +# +# This file is part of util-linux. +# +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This file is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +TS_TOPDIR="${0%/*}/../.." +. $TS_TOPDIR/functions.sh + +ts_init "$*" + +ts_check_test_command "$TS_CMD_LSBLK" +ts_check_prog xz +ts_check_prog tar + +for dump in $(ls $TS_SELF/dumps/*.tar.xz | sort); do + name=$(basename $dump .tar.xz) + dumpdir="$TS_OUTDIR/dumps" + + mkdir -p $dumpdir + tar -C $dumpdir --xz -xf $dump + + # + # Read *.cols from the tarball, but the expected output is not used + # from the tarball due to changes in lsblk fomatting etc. We keep up to + # date version in tests/expected/lsblk. + # + for cols_file in $(ls $dumpdir/$name/*.cols | sort); do + subname=$(basename $cols_file .cols) + subtestname="${name}-${subname}" + + ts_init_subtest $subtestname + cols=$(cat $cols_file) + ${TS_CMD_LSBLK} --sysroot "${dumpdir}/${name}" \ + --output $cols \ + >"${TS_OUTPUT}" 2>&1 + + ts_finalize_subtest + done +done + +ts_finalize + diff --git a/tests/ts/lsblk/mk-input.sh b/tests/ts/lsblk/mk-input.sh new file mode 100644 index 000000000..8cd467e9a --- /dev/null +++ b/tests/ts/lsblk/mk-input.sh @@ -0,0 +1,109 @@ +#!/bin/bash +# +# Copyright (C) 2018 Karel Zak <kzak@redhat.com> +# +# This script makes a copy of relevant files from /sys and /proc. +# The files are useful for lsblk(1) regression tests. +# +progname=$(basename $0) + +if [ -z "$1" ]; then + echo -e "\nusage: $progname <testname>\n" + exit 1 +fi + +TS_DUMP="$1" +TS_NAME=$(basename ${TS_DUMP}) +TS_TARBALL="$TS_DUMP.tar.xz" +TS_CMD_LSBLK=${TS_CMD_LSBLK:-"lsblk"} + +# +# procfs +# +mkdir -p $TS_DUMP/proc +mkdir -p $TS_DUMP/proc/self +cp /proc/self/mountinfo ${TS_DUMP}/proc/self +cp /proc/swaps ${TS_DUMP}/proc/swaps +cp /proc/version ${TS_DUMP}/proc/version + + +# +# sysfs +# +mkdir -p $TS_DUMP/sys/{block,dev/block} +cp --no-dereference /sys/dev/block/* ${TS_DUMP}/sys/dev/block +cp --no-dereference /sys/block/* ${TS_DUMP}/sys/block + +DEVS=$(find /sys/dev/block/ -type l) +for x in ${DEVS}; do + DEV="/sys/dev/block/$(readlink $x)" + + mkdir -p ${TS_DUMP}/${DEV} + + # attributes + for f in $(find ${DEV} -type f -not -path '*/trace/*' -not -path '*/uevent'); do + if [ ! -f ${TS_DUMP}/${f} ]; then + SUB=$(dirname $f) + mkdir -p ${TS_DUMP}/${SUB} + cp $f ${TS_DUMP}/$f 2> /dev/null + fi + done + + # symlinks (slave, holders, etc.) + for f in $(find ${DEV} -type l -not -path '*/subsystem' -not -path '*/bdi'); do + if [ ! -f ${TS_DUMP}/${f} ]; then + SUB=$(dirname $f) + mkdir -p ${TS_DUMP}/${SUB} + cp --no-dereference $f ${TS_DUMP}/$f + fi + done + + # device/ files + if [ -d ${DEV}/device/ ]; then + for f in $(find ${DEV}/device/ -maxdepth 1 -type f -not -path '*/uevent'); do + if [ ! -f ${TS_DUMP}/${f} ]; then + SUB=$(dirname $f) + cp $f ${TS_DUMP}/$f 2> /dev/null + fi + done + fi + +done + + +function mk_output { + local cols="NAME,${2}" + local subname="$1" + + echo "$cols" > ${TS_DUMP}/${subname}.cols + $TS_CMD_LSBLK -o ${cols} > ${TS_DUMP}/lsblk-${TS_NAME}-${subname} +} + + +LANG="POSIX" +LANGUAGE="POSIX" +LC_ALL="POSIX" +CHARSET="UTF-8" + +export LANG LANGUAGE LC_ALL CHARSET + +# +# lsblk info +# +$TS_CMD_LSBLK -V &> ${TS_DUMP}/version + +mk_output basic KNAME,MAJ:MIN,RM,SIZE,TYPE,MOUNTPOINT +mk_output vendor MODEL,VENDOR,REV +mk_output state RO,RM,HOTPLUG,RAND,STATE,ROTA,TYPE,PKNAME,SCHED +mk_output rw RA,WSAME +mk_output topo SIZE,ALIGNMENT,MIN-IO,OPT-IO,PHY-SEC,LOG-SEC,RQ-SIZE +mk_output discard DISC-ALN,DISC-GRAN,DISC-MAX,DISC-ZERO +mk_output zone ZONED + + +tar --xz -cvf ${TS_TARBALL} $TS_DUMP +rm -rf $TS_DUMP + +echo -e "\nPlease, send ${TS_TARBALL} to util-linux upstream. Thanks!\n" + + diff --git a/tests/ts/lscpu/lscpu b/tests/ts/lscpu/lscpu index 70fbce9f3..ccf271149 100755 --- a/tests/ts/lscpu/lscpu +++ b/tests/ts/lscpu/lscpu @@ -22,6 +22,8 @@ TS_TOPDIR="${0%/*}/../.." ts_init "$*" +ts_check_prog "tar" +ts_check_prog "gzip" ts_check_test_command "$TS_CMD_LSCPU" for dump in $(ls $TS_SELF/dumps/*.tar.gz | sort); do diff --git a/tests/ts/lsmem/lsmem b/tests/ts/lsmem/lsmem index f1a643f85..bedf4143f 100755 --- a/tests/ts/lsmem/lsmem +++ b/tests/ts/lsmem/lsmem @@ -21,6 +21,8 @@ TS_TOPDIR="${0%/*}/../.." ts_init "$*" ts_check_test_command "$TS_CMD_LSMEM" +ts_check_prog "tar" +ts_check_prog "bzip2" LSCOLUMNS="RANGE,SIZE,STATE,REMOVABLE,BLOCK,NODE" diff --git a/tests/ts/lsns/netnsid b/tests/ts/lsns/netnsid index 72c14de6c..9d04f28f0 100755 --- a/tests/ts/lsns/netnsid +++ b/tests/ts/lsns/netnsid @@ -36,6 +36,7 @@ vethb=lsns-vethb NS=LSNS-TEST-NETNSID-NS FIFO=$TS_OUTDIR/FIFO-NETNSID NULL=/dev/null +LOG=/dev/null #/root/foo.log function cleanup { ip link delete $vetha 2> $NULL || : @@ -43,24 +44,47 @@ function cleanup { rm -f $FIFO } +echo "==Cleanup" >> $LOG cleanup + +echo "==Create FIFO" >> $LOG mkfifo $FIFO +echo "==Netns ADD" >> $LOG if ip netns add $NS && ip link add name $vetha type veth peer name $vethb && ip link set $vethb netns $NS; then + echo "===Netns EXEC" >> $LOG ip netns exec $NS dd if=$FIFO bs=1 count=2 of=$NULL 2> $NULL & PID=$! + echo "====PID=$PID" >> $LOG else cleanup ts_skip "failed to initialize" fi { + echo "==Write to FIFO" >> $LOG dd if=/dev/zero bs=1 count=1 2> $NULL { - ip -o link show dev $vetha > $NULL + echo "===IP output" >> $LOG + ip -o link show dev $vetha >> $LOG + IP_ID=$(ip -o link show dev $vetha | sed -ne 's/.* *link-netnsid *\([0-9]*\)/\1/p') + echo "====ip show: IP_ID=$IP_ID" >> $LOG + + if [ "x$IP_ID" = "x" ]; then + echo "===IP output list id" >> $LOG + ip netns list-id >> $LOG + + IP_ID=$(ip netns list-id | awk "/name: $NS/ { print \$2 }") + echo "====ip list-id: IP_ID=$IP_ID" >> $LOG + fi + + echo "===LSNS output" >> $LOG + $TS_CMD_LSNS -o+NETNSID,NSFS --type net >> $LOG + LSNS_ID=$($TS_CMD_LSNS -n -o NETNSID --type net --task $PID | { read VAL; echo $VAL; } ) + echo "===LSNS_ID=$LSNS_ID" >> $LOG } dd if=/dev/zero bs=1 count=1 2> $NULL } > $FIFO diff --git a/tests/ts/mount/fstab-btrfs b/tests/ts/mount/fstab-btrfs index 090f52304..54c6bb8ba 100755 --- a/tests/ts/mount/fstab-btrfs +++ b/tests/ts/mount/fstab-btrfs @@ -42,7 +42,7 @@ TS_MOUNTPOINT_SUBVOL="$TS_MOUNTPOINT-subvol" TS_MOUNTPOINT_SUBVOLID="$TS_MOUNTPOINT-subvolid" TS_MOUNTPOINT_BIND="$TS_MOUNTPOINT-bind" -ts_device_init 42 +ts_device_init 50 DEVICE=$TS_LODEV [ -d "$TS_MOUNTPOINT_CREATE" ] || mkdir -p "$TS_MOUNTPOINT_CREATE" [ -d "$TS_MOUNTPOINT_DEFAULT" ] || mkdir -p "$TS_MOUNTPOINT_DEFAULT" diff --git a/tests/ts/uuid/oids b/tests/ts/uuid/oids index 3b005c5b2..77e010c1d 100755 --- a/tests/ts/uuid/oids +++ b/tests/ts/uuid/oids @@ -20,12 +20,14 @@ ts_init "$*" : . > $TS_OUTPUT -uuidgen --md5 --namespace @dns --name "www.widgets.com" >> $TS_OUTPUT +ts_check_test_command "$TS_CMD_UUIDGEN" -uuidgen --md5 --namespace @dns --name "www.example.com" >> $TS_OUTPUT +$TS_CMD_UUIDGEN --md5 --namespace @dns --name "www.widgets.com" >> $TS_OUTPUT -uuidgen --sha1 --namespace @dns --name "www.example.com" >> $TS_OUTPUT +$TS_CMD_UUIDGEN --md5 --namespace @dns --name "www.example.com" >> $TS_OUTPUT -uuidgen --sha1 --namespace @oid --hex --name "525400fc0f5e" >> $TS_OUTPUT +$TS_CMD_UUIDGEN --sha1 --namespace @dns --name "www.example.com" >> $TS_OUTPUT + +$TS_CMD_UUIDGEN --sha1 --namespace @oid --hex --name "525400fc0f5e" >> $TS_OUTPUT ts_finalize |