From: Petr Uzel Date: Thu, 26 Jul 2012 14:04:28 +0000 (+0200) Subject: tests: update fdisk test (default output format changed) X-Git-Tag: v2.22-rc1~25 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51ffaed7232e83872325ab10ee5642e1e2dcda7c;p=thirdparty%2Futil-linux.git tests: update fdisk test (default output format changed) Signed-off-by: Petr Uzel --- diff --git a/tests/expected/fdisk/align-512-4K b/tests/expected/fdisk/align-512-4K index a510c734e7..293f4ae00a 100644 --- a/tests/expected/fdisk/align-512-4K +++ b/tests/expected/fdisk/align-512-4K @@ -54,8 +54,7 @@ Last sector, +sectors or +size{K,M,G} (90112-102399, default 102399): Using defa Partition 7 of type Linux and of size 6 MiB is set Command (m for help): -Disk /dev/...: 52 MB, 52428800 bytes -32 heads, 32 sectors/track, 100 cylinders, total 102400 sectors +Disk /dev/...: 52 MB, 52428800 bytes, 102400 sectors Units = sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / 32768 bytes diff --git a/tests/expected/fdisk/align-512-4K-63 b/tests/expected/fdisk/align-512-4K-63 index e8192ce016..5369ec55f4 100644 --- a/tests/expected/fdisk/align-512-4K-63 +++ b/tests/expected/fdisk/align-512-4K-63 @@ -54,8 +54,7 @@ Last sector, +sectors or +size{K,M,G} (88063-102399, default 102399): Using defa Partition 7 of type Linux and of size 7 MiB is set Command (m for help): -Disk /dev/...: 52 MB, 52428800 bytes -32 heads, 32 sectors/track, 100 cylinders, total 102400 sectors +Disk /dev/...: 52 MB, 52428800 bytes, 102400 sectors Units = sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / 32768 bytes diff --git a/tests/expected/fdisk/align-512-4K-md b/tests/expected/fdisk/align-512-4K-md index b0081c6aec..7b7e4bf363 100644 --- a/tests/expected/fdisk/align-512-4K-md +++ b/tests/expected/fdisk/align-512-4K-md @@ -25,8 +25,7 @@ Last sector, +sectors or +size{K,M,G} (43008-102399, default 102399): Using defa Partition 2 of type Linux and of size 29 MiB is set Command (m for help): -Disk /dev/...: 52 MB, 52428800 bytes -32 heads, 32 sectors/track, 100 cylinders, total 102400 sectors +Disk /dev/...: 52 MB, 52428800 bytes, 102400 sectors Units = sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 4096 bytes / 32768 bytes @@ -69,8 +68,7 @@ Select (default p): Partition number (1-4, default 2): First sector (22528-10009 Last sector, +sectors or +size{K,M,G} (22528-100095, default 100095): Partition 2 of type Linux and of size 10 MiB is set Command (m for help): -Disk /dev/md8: 51 MB, 51249152 bytes -2 heads, 4 sectors/track, 12512 cylinders, total 100096 sectors +Disk /dev/md8: 51 MB, 51249152 bytes, 100096 sectors Units = sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 4096 bytes I/O size (minimum/optimal): 65536 bytes / 131072 bytes diff --git a/tests/expected/fdisk/align-512-512 b/tests/expected/fdisk/align-512-512 index 190ad0afe9..37cfa71ece 100644 --- a/tests/expected/fdisk/align-512-512 +++ b/tests/expected/fdisk/align-512-512 @@ -50,8 +50,7 @@ Last sector, +sectors or +size{K,M,G} (90112-102399, default 102399): Using defa Partition 7 of type Linux and of size 6 MiB is set Command (m for help): -Disk /dev/loop0: 52 MB, 52428800 bytes -255 heads, 63 sectors/track, 6 cylinders, total 102400 sectors +Disk /dev/loop0: 52 MB, 52428800 bytes, 102400 sectors Units = sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / 512 bytes diff --git a/tests/expected/fdisk/align-512-512-topology b/tests/expected/fdisk/align-512-512-topology index 2180081c2d..d16233fc38 100644 --- a/tests/expected/fdisk/align-512-512-topology +++ b/tests/expected/fdisk/align-512-512-topology @@ -50,8 +50,7 @@ Last sector, +sectors or +size{K,M,G} (90112-102399, default 102399): Using defa Partition 7 of type Linux and of size 6 MiB is set Command (m for help): -Disk /dev/...: 52 MB, 52428800 bytes -32 heads, 32 sectors/track, 100 cylinders, total 102400 sectors +Disk /dev/...: 52 MB, 52428800 bytes, 102400 sectors Units = sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes I/O size (minimum/optimal): 512 bytes / 32768 bytes diff --git a/tests/expected/fdisk/oddinput b/tests/expected/fdisk/oddinput index 65feb03320..14f2528c8d 100644 --- a/tests/expected/fdisk/oddinput +++ b/tests/expected/fdisk/oddinput @@ -2,7 +2,7 @@ Initialize empty image f1c9645dbc14efddc7d8a322685f26eb oddinput.img Empty image listing -Disk testimage: 10 MB, 10485760 bytes +Disk testimage: 10 MB, 10485760 bytes, 20480 sectors 255 heads, 63 sectors/track, 1 cylinders Units = cylinders of 16065 * 512 = 8225280 bytes Sector size (logical/physical): 512 bytes / 512 bytes