diff options
Diffstat (limited to 'tests/expected')
16 files changed, 75 insertions, 223 deletions
diff --git a/tests/expected/column/table-empty-column-at-eol b/tests/expected/column/table-empty-column-at-eol new file mode 100644 index 000000000..948cf947f --- /dev/null +++ b/tests/expected/column/table-empty-column-at-eol @@ -0,0 +1 @@ +| diff --git a/tests/expected/column/table-empty-column-at-eol2 b/tests/expected/column/table-empty-column-at-eol2 new file mode 100644 index 000000000..7c4378506 --- /dev/null +++ b/tests/expected/column/table-empty-column-at-eol2 @@ -0,0 +1 @@ +|| diff --git a/tests/expected/fdisk/gpt-resize b/tests/expected/fdisk/gpt-resize index 0b3c25a27..2871f1a14 100644 --- a/tests/expected/fdisk/gpt-resize +++ b/tests/expected/fdisk/gpt-resize @@ -35,7 +35,7 @@ Command (m for help): The partition table has been altered. Calling ioctl() to re-read partition table. Re-reading the partition table failed.: Invalid argument -The kernel still uses the old table. The new table will be used at the next reboot or after you run partprobe(8) or kpartx(8). +The kernel still uses the old table. The new table will be used at the next reboot or after you run partprobe(8) or partx(8). diff --git a/tests/expected/fdisk/mbr-nondos-mode.sparc b/tests/expected/fdisk/mbr-nondos-mode.sparc deleted file mode 100644 index ffbbd8024..000000000 --- a/tests/expected/fdisk/mbr-nondos-mode.sparc +++ /dev/null @@ -1,189 +0,0 @@ -Initialize empty image -8f4e33f3dc3e414ff94e5fb6905cba8c mbr-nondos-mode.img -Create new DOS partition table -8f4e33f3dc3e414ff94e5fb6905cba8c mbr-nondos-mode.img - ----layout---------- -Disk <removed>: 20 MiB, 20971520 bytes, 40960 sectors -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / <removed> bytes -------------------- - -Create 1st primary partition -d5ad6d4e743430c2a61e558bb3319175 mbr-nondos-mode.img - ----layout---------- -Disk <removed>: 20 MiB, 20971520 bytes, 40960 sectors -Geometry: 255 heads, 63 sectors/track, 2 cylinders -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / <removed> bytes -Disklabel type: sun - -Device Start End Sectors Size Id Type Flags -<removed>1 0 16064 16065 7.9M 83 Linux native -<removed>2 16065 32129 16065 7.9M 82 Linux swap u -<removed>3 0 32129 32130 15.7M 5 Whole disk -------------------- - -Set primary partition active -d59bb4ba5914242f9a63a2d13fb68752 mbr-nondos-mode.img - ----layout---------- -Disk <removed>: 20 MiB, 20971520 bytes, 40960 sectors -Geometry: 255 heads, 63 sectors/track, 2 cylinders -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / <removed> bytes -Disklabel type: sun - -Device Start End Sectors Size Id Type Flags -<removed>1 0 16064 16065 7.9M 83 Linux native r -<removed>2 16065 32129 16065 7.9M 82 Linux swap u -<removed>3 0 32129 32130 15.7M 5 Whole disk -------------------- - -Re-create 1st primary partition -d8ba04bdd46cec690fa672ac8fcaf387 mbr-nondos-mode.img - ----layout---------- -Disk <removed>: 20 MiB, 20971520 bytes, 40960 sectors -Geometry: 255 heads, 63 sectors/track, 2 cylinders -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / <removed> bytes -Disklabel type: sun - -Device Start End Sectors Size Id Type Flags -<removed>1 0 16064 16065 7.9M 83 Linux native r -<removed>2 16065 32129 16065 7.9M 82 Linux swap u -------------------- - -Create 2nd primary partition -d8ba04bdd46cec690fa672ac8fcaf387 mbr-nondos-mode.img - ----layout---------- -Disk <removed>: 20 MiB, 20971520 bytes, 40960 sectors -Geometry: 255 heads, 63 sectors/track, 2 cylinders -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / <removed> bytes -Disklabel type: sun - -Device Start End Sectors Size Id Type Flags -<removed>1 0 16064 16065 7.9M 83 Linux native r -<removed>2 16065 32129 16065 7.9M 82 Linux swap u -------------------- - -Create extended partition -d59bb4ba5914242f9a63a2d13fb68752 mbr-nondos-mode.img - ----layout---------- -Disk <removed>: 20 MiB, 20971520 bytes, 40960 sectors -Geometry: 255 heads, 63 sectors/track, 2 cylinders -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / <removed> bytes -Disklabel type: sun - -Device Start End Sectors Size Id Type Flags -<removed>1 0 16064 16065 7.9M 83 Linux native r -<removed>2 16065 32129 16065 7.9M 82 Linux swap u -<removed>3 0 32129 32130 15.7M 5 Whole disk -------------------- - -Create logical partitions -d59bb4ba5914242f9a63a2d13fb68752 mbr-nondos-mode.img - ----layout---------- -Disk <removed>: 20 MiB, 20971520 bytes, 40960 sectors -Geometry: 255 heads, 63 sectors/track, 2 cylinders -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / <removed> bytes -Disklabel type: sun - -Device Start End Sectors Size Id Type Flags -<removed>1 0 16064 16065 7.9M 83 Linux native r -<removed>2 16065 32129 16065 7.9M 82 Linux swap u -<removed>3 0 32129 32130 15.7M 5 Whole disk -------------------- - -Delete logical partitions -d59bb4ba5914242f9a63a2d13fb68752 mbr-nondos-mode.img - ----layout---------- -Disk <removed>: 20 MiB, 20971520 bytes, 40960 sectors -Geometry: 255 heads, 63 sectors/track, 2 cylinders -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / <removed> bytes -Disklabel type: sun - -Device Start End Sectors Size Id Type Flags -<removed>1 0 16064 16065 7.9M 83 Linux native r -<removed>2 16065 32129 16065 7.9M 82 Linux swap u -<removed>3 0 32129 32130 15.7M 5 Whole disk -------------------- - -Create another logical partition -d59bb4ba5914242f9a63a2d13fb68752 mbr-nondos-mode.img - ----layout---------- -Disk <removed>: 20 MiB, 20971520 bytes, 40960 sectors -Geometry: 255 heads, 63 sectors/track, 2 cylinders -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / <removed> bytes -Disklabel type: sun - -Device Start End Sectors Size Id Type Flags -<removed>1 0 16064 16065 7.9M 83 Linux native r -<removed>2 16065 32129 16065 7.9M 82 Linux swap u -<removed>3 0 32129 32130 15.7M 5 Whole disk -------------------- - -Delete primary partition -0bd87175c4c5c3ef9a46595027b6369c mbr-nondos-mode.img - ----layout---------- -Disk <removed>: 20 MiB, 20971520 bytes, 40960 sectors -Geometry: 255 heads, 63 sectors/track, 2 cylinders -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / <removed> bytes -Disklabel type: sun - -Device Start End Sectors Size Id Type Flags -<removed>2 16065 32129 16065 7.9M 82 Linux swap u -<removed>3 0 32129 32130 15.7M 5 Whole disk -------------------- - -Delete primary partition -33f6e541ddcafed65d231ce3f2b76a59 mbr-nondos-mode.img - ----layout---------- -Disk <removed>: 20 MiB, 20971520 bytes, 40960 sectors -Geometry: 255 heads, 63 sectors/track, 2 cylinders -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / <removed> bytes -Disklabel type: sun - -Device Start End Sectors Size Id Type Flags -<removed>3 0 32129 32130 15.7M 5 Whole disk -------------------- - -Delete extended partition -e923755cbc0054eb85341fe119be07f9 mbr-nondos-mode.img - ----layout---------- -Disk <removed>: 20 MiB, 20971520 bytes, 40960 sectors -Geometry: 255 heads, 63 sectors/track, 2 cylinders -Units: sectors of 1 * 512 = 512 bytes -Sector size (logical/physical): 512 bytes / 512 bytes -I/O size (minimum/optimal): 512 bytes / <removed> bytes -Disklabel type: sun -------------------- - diff --git a/tests/expected/fdisk/sunlabel b/tests/expected/fdisk/sunlabel index 47b5e756b..5ada4fab1 100644 --- a/tests/expected/fdisk/sunlabel +++ b/tests/expected/fdisk/sunlabel @@ -18,7 +18,7 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes Disklabel type: sun Device Start End Cylinders Size Id Type Flags -<removed>1 1 128 129 4M 83 Linux native +<removed>1 1 128 129 4M 83 Linux native Set partition sysid df75defdb97fbd56222aed18631a22d0 sunlabel.img Disk <removed>: 10 MiB, 10485760 bytes, 20480 sectors @@ -29,7 +29,7 @@ I/O size (minimum/optimal): 512 bytes / <removed> bytes Disklabel type: sun Device Start End Cylinders Size Id Type Flags -<removed>1 1 128 129 4M 4 SunOS usr +<removed>1 1 128 129 4M 4 SunOS usr Set first partition readonly da23f66698d9a553162887621d4c7490 sunlabel.img Disk <removed>: 10 MiB, 10485760 bytes, 20480 sectors @@ -75,6 +75,6 @@ Disklabel type: sun Device Start End Cylinders Size Id Type Flags <removed>1 1 128 129 4M 4 SunOS usr ur -<removed>2 129 325 198 6.1M 83 Linux native +<removed>2 129 325 198 6.1M 83 Linux native Delete all partitions 502ba7a0cfdce2849c3a99881f0590c3 sunlabel.img diff --git a/tests/expected/libmount/context-X-mount.mkdir b/tests/expected/libmount/context-X-comment index 7504a7e83..7504a7e83 100644 --- a/tests/expected/libmount/context-X-mount.mkdir +++ b/tests/expected/libmount/context-X-comment diff --git a/tests/expected/libmount/context-x-mount.mkdir b/tests/expected/libmount/context-x-permanent index 7504a7e83..7504a7e83 100644 --- a/tests/expected/libmount/context-x-mount.mkdir +++ b/tests/expected/libmount/context-x-permanent diff --git a/tests/expected/libsmartcols/fromfile-padding-default b/tests/expected/libsmartcols/fromfile-padding-default new file mode 100644 index 000000000..f935be267 --- /dev/null +++ b/tests/expected/libsmartcols/fromfile-padding-default @@ -0,0 +1,11 @@ +NAME.. ......NUM STRINGS STRINGS +aaaa.. ........0 aaaa... aaaa +bbb... ......100 bbb.... bbb +ccccc. .......21 ccccc.. ccccc +dddddd ........3 dddddd. dddddd +ee.... ......411 ee..... ee +ffff.. .....5111 ....... +gggggg 678993321 gggggg. gggggg +hhh... ..7666666 hhh.... hhh +iiiiii .....8765 iiiiii. iiiiii +jj.... ...987456 jj..... jj diff --git a/tests/expected/libsmartcols/fromfile-padding-maxout b/tests/expected/libsmartcols/fromfile-padding-maxout new file mode 100644 index 000000000..3f73ce38b --- /dev/null +++ b/tests/expected/libsmartcols/fromfile-padding-maxout @@ -0,0 +1,11 @@ +NAME.............. ..................NUM STRINGS............ STRINGS............ +aaaa.............. ....................0 aaaa............... aaaa............... +bbb............... ..................100 bbb................ bbb................ +ccccc............. ...................21 ccccc.............. ccccc.............. +dddddd............ ....................3 dddddd............. dddddd............. +ee................ ..................411 ee................. ee................. +ffff.............. .................5111 ................... ................... +gggggg............ ............678993321 gggggg............. gggggg............. +hhh............... ..............7666666 hhh................ hhh................ +iiiiii............ .................8765 iiiiii............. iiiiii............. +jj................ ...............987456 jj................. jj................. diff --git a/tests/expected/libsmartcols/fromfile-padding-minout b/tests/expected/libsmartcols/fromfile-padding-minout new file mode 100644 index 000000000..ac8eabc93 --- /dev/null +++ b/tests/expected/libsmartcols/fromfile-padding-minout @@ -0,0 +1,11 @@ +NAME.. ......NUM STRINGS STRINGS +aaaa.. ........0 aaaa... aaaa +bbb... ......100 bbb.... bbb +ccccc. .......21 ccccc.. ccccc +dddddd ........3 dddddd. dddddd +ee.... ......411 ee..... ee +ffff.. .....5111 +gggggg 678993321 gggggg. gggggg +hhh... ..7666666 hhh.... hhh +iiiiii .....8765 iiiiii. iiiiii +jj.... ...987456 jj..... jj diff --git a/tests/expected/lsblk/lsblk-simple-lvm-vendor b/tests/expected/lsblk/lsblk-simple-lvm-vendor index 591c703af..24ee97dd4 100644 --- a/tests/expected/lsblk/lsblk-simple-lvm-vendor +++ b/tests/expected/lsblk/lsblk-simple-lvm-vendor @@ -1,22 +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 +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 +|-sda1 +|-sda2 +|-sda3 +|-sda4 +|-sda5 +`-sda6 sdb WDC WD800JD-00MS ATA 1E01 -`-sdb1 -nvme0n1 KINGSTON SKC1000240G -|-nvme0n1p1 -|-nvme0n1p2 -`-nvme0n1p3 +`-sdb1 +nvme0n1 KINGSTON SKC1000240G +|-nvme0n1p1 +|-nvme0n1p2 +`-nvme0n1p3 diff --git a/tests/expected/lsblk/lsblk-simple-nvme-vendor b/tests/expected/lsblk/lsblk-simple-nvme-vendor index 69e972a31..2a0a90514 100644 --- a/tests/expected/lsblk/lsblk-simple-nvme-vendor +++ b/tests/expected/lsblk/lsblk-simple-nvme-vendor @@ -1,14 +1,14 @@ NAME MODEL VENDOR REV sda KINGSTON SH103S3 ATA BBF0 -|-sda1 -|-sda2 -|-sda3 -|-sda4 -|-sda5 -`-sda6 +|-sda1 +|-sda2 +|-sda3 +|-sda4 +|-sda5 +`-sda6 sdb WDC WD800JD-00MS ATA 1E01 -`-sdb1 -nvme0n1 KINGSTON SKC1000240G -|-nvme0n1p1 -|-nvme0n1p2 -`-nvme0n1p3 +`-sdb1 +nvme0n1 KINGSTON SKC1000240G +|-nvme0n1p1 +|-nvme0n1p2 +`-nvme0n1p3 diff --git a/tests/expected/misc/mountpoint b/tests/expected/misc/mountpoint new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/tests/expected/misc/mountpoint diff --git a/tests/expected/misc/mountpoint-default b/tests/expected/misc/mountpoint-default new file mode 100644 index 000000000..9a7ac6ab3 --- /dev/null +++ b/tests/expected/misc/mountpoint-default @@ -0,0 +1,2 @@ +./symlink-to-root is a mountpoint +0 diff --git a/tests/expected/misc/mountpoint-mutually-exclusive b/tests/expected/misc/mountpoint-mutually-exclusive new file mode 100644 index 000000000..38c36f13b --- /dev/null +++ b/tests/expected/misc/mountpoint-mutually-exclusive @@ -0,0 +1,2 @@ +mountpoint: --devno and --nofollow are mutually exclusive +1 diff --git a/tests/expected/misc/mountpoint-nofollow b/tests/expected/misc/mountpoint-nofollow new file mode 100644 index 000000000..1ba174959 --- /dev/null +++ b/tests/expected/misc/mountpoint-nofollow @@ -0,0 +1,2 @@ +./symlink-to-root is not a mountpoint +1 |