From: Karel Zak Date: Fri, 13 May 2011 13:05:45 +0000 (+0200) Subject: tests: update for recent fdisk changes X-Git-Tag: v2.20-rc1~272 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0915c581678163e73909425eb8413f2077df9252;p=thirdparty%2Futil-linux.git tests: update for recent fdisk changes Signed-off-by: Karel Zak --- diff --git a/tests/commands.sh.in b/tests/commands.sh.in index ada266ef51..0318046d7e 100644 --- a/tests/commands.sh.in +++ b/tests/commands.sh.in @@ -51,7 +51,7 @@ TS_CMD_COL=${TS_CMD_COL:-"$top_builddir/text-utils/col"} TS_CMD_NAMEI=${TS_CMD_NAMEI-"$top_builddir/misc-utils/namei"} TS_CMD_LOOK=${TS_CMD_LOOK-"$top_builddir/misc-utils/look"} TS_CMD_CAL=${TS_CMD_CAL-"$top_builddir/misc-utils/cal"} -TS_CMD_SCRIPT=${TS_CMD_SCRIPT-"$top_builddir/misc-utils/script"} +TS_CMD_SCRIPT=${TS_CMD_SCRIPT-"$top_builddir/term-utils/script"} TS_CMD_CHECKTTY=${TS_CMD_CHECKTTY-"$top_builddir/login-utils/checktty_test"} TS_CMD_ISLOCAL=${TS_CMD_ISLOCAL-"$top_builddir/login-utils/islocal_test"} diff --git a/tests/expected/blkid/md-raid0-whole b/tests/expected/blkid/md-raid0-whole index 2e0b824a3b..54e4012c36 100644 --- a/tests/expected/blkid/md-raid0-whole +++ b/tests/expected/blkid/md-raid0-whole @@ -8,15 +8,15 @@ After that, of course, the previous content won't be recoverable. Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite) -Command (m for help): Command action +Command (m for help): Partition type: + p primary (0 primary, 0 extended, 4 free) e extended - p primary partition (1-4) -Partition number (1-4, default 1): First sector (2048-204543, default 2048): Using default value 2048 +Select (default p): Partition number (1-4, default 1): First sector (2048-204543, default 2048): Using default value 2048 Last sector, +sectors or +size{K,M,G} (2048-204543, default 204543): -Command (m for help): Command action +Command (m for help): Partition type: + p primary (1 primary, 0 extended, 3 free) e extended - p primary partition (1-4) -Partition number (1-4, default 2): First sector (22528-204543, default 22528): Using default value 22528 +Select (default p): Partition number (1-4, default 2): First sector (22528-204543, default 22528): Using default value 22528 Last sector, +sectors or +size{K,M,G} (22528-204543, default 204543): Using default value 204543 Command (m for help): diff --git a/tests/expected/blkid/md-raid1-part b/tests/expected/blkid/md-raid1-part index 96033ef8c8..8f7787d9a8 100644 --- a/tests/expected/blkid/md-raid1-part +++ b/tests/expected/blkid/md-raid1-part @@ -6,15 +6,15 @@ After that, of course, the previous content won't be recoverable. Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite) -Command (m for help): Command action +Command (m for help): Partition type: + p primary (0 primary, 0 extended, 4 free) e extended - p primary partition (1-4) -Partition number (1-4, default 1): First sector (2048-104447, default 2048): Using default value 2048 +Select (default p): Partition number (1-4, default 1): First sector (2048-104447, default 2048): Using default value 2048 Last sector, +sectors or +size{K,M,G} (2048-104447, default 104447): -Command (m for help): Command action +Command (m for help): Partition type: + p primary (1 primary, 0 extended, 3 free) e extended - p primary partition (1-4) -Partition number (1-4, default 2): First sector (53248-104447, default 53248): Using default value 53248 +Select (default p): Partition number (1-4, default 2): First sector (53248-104447, default 53248): Using default value 53248 Last sector, +sectors or +size{K,M,G} (53248-104447, default 104447): Using default value 104447 Command (m for help): diff --git a/tests/expected/blkid/md-raid1-whole b/tests/expected/blkid/md-raid1-whole index 32281c61c4..cbdbb7bc6c 100644 --- a/tests/expected/blkid/md-raid1-whole +++ b/tests/expected/blkid/md-raid1-whole @@ -8,15 +8,15 @@ After that, of course, the previous content won't be recoverable. Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite) -Command (m for help): Command action +Command (m for help): Partition type: + p primary (0 primary, 0 extended, 4 free) e extended - p primary partition (1-4) -Partition number (1-4, default 1): First sector (2048-102271, default 2048): Using default value 2048 +Select (default p): Partition number (1-4, default 1): First sector (2048-102271, default 2048): Using default value 2048 Last sector, +sectors or +size{K,M,G} (2048-102271, default 102271): -Command (m for help): Command action +Command (m for help): Partition type: + p primary (1 primary, 0 extended, 3 free) e extended - p primary partition (1-4) -Partition number (1-4, default 2): First sector (22528-102271, default 22528): Using default value 22528 +Select (default p): Partition number (1-4, default 2): First sector (22528-102271, default 22528): Using default value 22528 Last sector, +sectors or +size{K,M,G} (22528-102271, default 102271): Command (m for help): Disk /dev/md8: 52 MB, 52363264 bytes diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K index c5b9e04cd5..ed1e03be7e 100644 --- a/tests/expected/fdisk/align-512-4K +++ b/tests/expected/fdisk/align-512-4K @@ -10,33 +10,39 @@ The device presents a logical sector size that is smaller than the physical sector size. Aligning to a physical sector (or optimal I/O) size boundary is recommended, or performance may be impacted. -Command (m for help): Command action +Command (m for help): Partition type: + p primary (0 primary, 0 extended, 4 free) e extended - p primary partition (1-4) -Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048 +Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048 Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): -Command (m for help): Command action +Command (m for help): Partition type: + p primary (1 primary, 0 extended, 3 free) e extended - p primary partition (1-4) -Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528 +Select (default p): Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528 Last sector, +sectors or +size{K,M,G} (22528-102399, default 102399): -Command (m for help): Command action +Command (m for help): Partition type: + p primary (2 primary, 0 extended, 2 free) e extended - p primary partition (1-4) -Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008 +Select (default p): Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008 Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): -Command (m for help): Command action +Command (m for help): Partition type: + p primary (3 primary, 0 extended, 1 free) e extended - p primary partition (1-4) -Selected partition 4 +Select (default e): Selected partition 4 First sector (63488-102399, default 63488): Using default value 63488 Last sector, +sectors or +size{K,M,G} (63488-102399, default 102399): Using default value 102399 -Command (m for help): First sector (65536-102399, default 65536): Using default value 65536 +Command (m for help): All primary partitions are in use +Adding logical partition 5 +First sector (65536-102399, default 65536): Using default value 65536 Last sector, +sectors or +size{K,M,G} (65536-102399, default 102399): -Command (m for help): First sector (77824-102399, default 77824): Using default value 77824 +Command (m for help): All primary partitions are in use +Adding logical partition 6 +First sector (77824-102399, default 77824): Using default value 77824 Last sector, +sectors or +size{K,M,G} (77824-102399, default 102399): -Command (m for help): First sector (90112-102399, default 90112): Using default value 90112 +Command (m for help): All primary partitions are in use +Adding logical partition 7 +First sector (90112-102399, default 90112): Using default value 90112 Last sector, +sectors or +size{K,M,G} (90112-102399, default 102399): Using default value 102399 Command (m for help): diff --git a/tests/expected/fdisk/align-512-4K-63 b/tests/expected/fdisk/align-512-4K-63 index b33794396e..261f54c8c8 100644 --- a/tests/expected/fdisk/align-512-4K-63 +++ b/tests/expected/fdisk/align-512-4K-63 @@ -10,33 +10,39 @@ The device presents a logical sector size that is smaller than the physical sector size. Aligning to a physical sector (or optimal I/O) size boundary is recommended, or performance may be impacted. -Command (m for help): Command action +Command (m for help): Partition type: + p primary (0 primary, 0 extended, 4 free) e extended - p primary partition (1-4) -Partition number (1-4, default 1): First sector (7-102399, default 7): Using default value 7 +Select (default p): Partition number (1-4, default 1): First sector (7-102399, default 7): Using default value 7 Last sector, +sectors or +size{K,M,G} (7-102399, default 102399): -Command (m for help): Command action +Command (m for help): Partition type: + p primary (1 primary, 0 extended, 3 free) e extended - p primary partition (1-4) -Partition number (1-4, default 2): First sector (20487-102399, default 20487): Using default value 20487 +Select (default p): Partition number (1-4, default 2): First sector (20487-102399, default 20487): Using default value 20487 Last sector, +sectors or +size{K,M,G} (20487-102399, default 102399): -Command (m for help): Command action +Command (m for help): Partition type: + p primary (2 primary, 0 extended, 2 free) e extended - p primary partition (1-4) -Partition number (1-4, default 3): First sector (40967-102399, default 40967): Using default value 40967 +Select (default p): Partition number (1-4, default 3): First sector (40967-102399, default 40967): Using default value 40967 Last sector, +sectors or +size{K,M,G} (40967-102399, default 102399): -Command (m for help): Command action +Command (m for help): Partition type: + p primary (3 primary, 0 extended, 1 free) e extended - p primary partition (1-4) -Selected partition 4 +Select (default e): Selected partition 4 First sector (61447-102399, default 61447): Using default value 61447 Last sector, +sectors or +size{K,M,G} (61447-102399, default 102399): Using default value 102399 -Command (m for help): First sector (61454-102399, default 63487): Using default value 63487 +Command (m for help): All primary partitions are in use +Adding logical partition 5 +First sector (61454-102399, default 63487): Using default value 63487 Last sector, +sectors or +size{K,M,G} (63487-102399, default 102399): -Command (m for help): First sector (61454-102399, default 75775): Using default value 75775 +Command (m for help): All primary partitions are in use +Adding logical partition 6 +First sector (61454-102399, default 75775): Using default value 75775 Last sector, +sectors or +size{K,M,G} (75775-102399, default 102399): -Command (m for help): First sector (61454-102399, default 88063): Using default value 88063 +Command (m for help): All primary partitions are in use +Adding logical partition 7 +First sector (61454-102399, default 88063): Using default value 88063 Last sector, +sectors or +size{K,M,G} (88063-102399, default 102399): Using default value 102399 Command (m for help): diff --git a/tests/expected/fdisk/align-512-4K-md b/tests/expected/fdisk/align-512-4K-md index 8516053ecf..7de6d2e84b 100644 --- a/tests/expected/fdisk/align-512-4K-md +++ b/tests/expected/fdisk/align-512-4K-md @@ -10,15 +10,15 @@ The device presents a logical sector size that is smaller than the physical sector size. Aligning to a physical sector (or optimal I/O) size boundary is recommended, or performance may be impacted. -Command (m for help): Command action +Command (m for help): Partition type: + p primary (0 primary, 0 extended, 4 free) e extended - p primary partition (1-4) -Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048 +Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048 Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): -Command (m for help): Command action +Command (m for help): Partition type: + p primary (1 primary, 0 extended, 3 free) e extended - p primary partition (1-4) -Partition number (1-4, default 2): First sector (43008-102399, default 43008): Using default value 43008 +Select (default p): Partition number (1-4, default 2): First sector (43008-102399, default 43008): Using default value 43008 Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): Using default value 102399 Command (m for help): @@ -52,15 +52,15 @@ The device presents a logical sector size that is smaller than the physical sector size. Aligning to a physical sector (or optimal I/O) size boundary is recommended, or performance may be impacted. -Command (m for help): Command action +Command (m for help): Partition type: + p primary (0 primary, 0 extended, 4 free) e extended - p primary partition (1-4) -Partition number (1-4, default 1): First sector (2048-100095, default 2048): Using default value 2048 +Select (default p): Partition number (1-4, default 1): First sector (2048-100095, default 2048): Using default value 2048 Last sector, +sectors or +size{K,M,G} (2048-100095, default 100095): -Command (m for help): Command action +Command (m for help): Partition type: + p primary (1 primary, 0 extended, 3 free) e extended - p primary partition (1-4) -Partition number (1-4, default 2): First sector (22528-100095, default 22528): Using default value 22528 +Select (default p): Partition number (1-4, default 2): First sector (22528-100095, default 22528): Using default value 22528 Last sector, +sectors or +size{K,M,G} (22528-100095, default 100095): Command (m for help): Disk /dev/md8: 51 MB, 51249152 bytes diff --git a/tests/expected/fdisk/align-512-512 b/tests/expected/fdisk/align-512-512 index c940f80620..13931d4145 100644 --- a/tests/expected/fdisk/align-512-512 +++ b/tests/expected/fdisk/align-512-512 @@ -6,33 +6,39 @@ After that, of course, the previous content won't be recoverable. Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite) -Command (m for help): Command action +Command (m for help): Partition type: + p primary (0 primary, 0 extended, 4 free) e extended - p primary partition (1-4) -Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048 +Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048 Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): -Command (m for help): Command action +Command (m for help): Partition type: + p primary (1 primary, 0 extended, 3 free) e extended - p primary partition (1-4) -Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528 +Select (default p): Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528 Last sector, +sectors or +size{K,M,G} (22528-102399, default 102399): -Command (m for help): Command action +Command (m for help): Partition type: + p primary (2 primary, 0 extended, 2 free) e extended - p primary partition (1-4) -Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008 +Select (default p): Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008 Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): -Command (m for help): Command action +Command (m for help): Partition type: + p primary (3 primary, 0 extended, 1 free) e extended - p primary partition (1-4) -Selected partition 4 +Select (default e): Selected partition 4 First sector (63488-102399, default 63488): Using default value 63488 Last sector, +sectors or +size{K,M,G} (63488-102399, default 102399): Using default value 102399 -Command (m for help): First sector (65536-102399, default 65536): Using default value 65536 +Command (m for help): All primary partitions are in use +Adding logical partition 5 +First sector (65536-102399, default 65536): Using default value 65536 Last sector, +sectors or +size{K,M,G} (65536-102399, default 102399): -Command (m for help): First sector (77824-102399, default 77824): Using default value 77824 +Command (m for help): All primary partitions are in use +Adding logical partition 6 +First sector (77824-102399, default 77824): Using default value 77824 Last sector, +sectors or +size{K,M,G} (77824-102399, default 102399): -Command (m for help): First sector (90112-102399, default 90112): Using default value 90112 +Command (m for help): All primary partitions are in use +Adding logical partition 7 +First sector (90112-102399, default 90112): Using default value 90112 Last sector, +sectors or +size{K,M,G} (90112-102399, default 102399): Using default value 102399 Command (m for help): diff --git a/tests/expected/fdisk/align-512-512-topology b/tests/expected/fdisk/align-512-512-topology index bc631cf9e3..af8695528e 100644 --- a/tests/expected/fdisk/align-512-512-topology +++ b/tests/expected/fdisk/align-512-512-topology @@ -6,33 +6,39 @@ After that, of course, the previous content won't be recoverable. Warning: invalid flag 0x0000 of partition table 4 will be corrected by w(rite) -Command (m for help): Command action +Command (m for help): Partition type: + p primary (0 primary, 0 extended, 4 free) e extended - p primary partition (1-4) -Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048 +Select (default p): Partition number (1-4, default 1): First sector (2048-102399, default 2048): Using default value 2048 Last sector, +sectors or +size{K,M,G} (2048-102399, default 102399): -Command (m for help): Command action +Command (m for help): Partition type: + p primary (1 primary, 0 extended, 3 free) e extended - p primary partition (1-4) -Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528 +Select (default p): Partition number (1-4, default 2): First sector (22528-102399, default 22528): Using default value 22528 Last sector, +sectors or +size{K,M,G} (22528-102399, default 102399): -Command (m for help): Command action +Command (m for help): Partition type: + p primary (2 primary, 0 extended, 2 free) e extended - p primary partition (1-4) -Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008 +Select (default p): Partition number (1-4, default 3): First sector (43008-102399, default 43008): Using default value 43008 Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): -Command (m for help): Command action +Command (m for help): Partition type: + p primary (3 primary, 0 extended, 1 free) e extended - p primary partition (1-4) -Selected partition 4 +Select (default e): Selected partition 4 First sector (63488-102399, default 63488): Using default value 63488 Last sector, +sectors or +size{K,M,G} (63488-102399, default 102399): Using default value 102399 -Command (m for help): First sector (65536-102399, default 65536): Using default value 65536 +Command (m for help): All primary partitions are in use +Adding logical partition 5 +First sector (65536-102399, default 65536): Using default value 65536 Last sector, +sectors or +size{K,M,G} (65536-102399, default 102399): -Command (m for help): First sector (77824-102399, default 77824): Using default value 77824 +Command (m for help): All primary partitions are in use +Adding logical partition 6 +First sector (77824-102399, default 77824): Using default value 77824 Last sector, +sectors or +size{K,M,G} (77824-102399, default 102399): -Command (m for help): First sector (90112-102399, default 90112): Using default value 90112 +Command (m for help): All primary partitions are in use +Adding logical partition 7 +First sector (90112-102399, default 90112): Using default value 90112 Last sector, +sectors or +size{K,M,G} (90112-102399, default 102399): Using default value 102399 Command (m for help):