From: Karel Zak Date: Tue, 3 Feb 2015 13:20:53 +0000 (+0100) Subject: tests: don't hardcode devnames X-Git-Tag: v2.26-rc2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d5ae6d80a165ac06f3f9ffc1e6a12a6a7d93545;p=thirdparty%2Futil-linux.git tests: don't hardcode devnames Signed-off-by: Karel Zak --- diff --git a/tests/expected/fdisk/align-512-4K-topology b/tests/expected/fdisk/align-512-4K-topology deleted file mode 100644 index 88f5f37084..0000000000 --- a/tests/expected/fdisk/align-512-4K-topology +++ /dev/null @@ -1,78 +0,0 @@ -Create partitions -Device contains neither a valid DOS partition table, nor Sun, SGI or OSF disklabel -Building a new DOS disklabel with disk identifier 0x817cb84a. -Changes will remain in memory only, until you decide to write them. -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) - -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. - -WARNING: DOS-compatible mode is deprecated. It's strongly recommended to - switch off the mode (command 'c') and change display units to - sectors (command 'u'). - -Command (m for help): DOS Compatibility flag is not set - -Command (m for help): Changing display/entry units to sectors - -Command (m for help): Command action - e extended - p primary partition (1-4) -Partition number (1-4): First sector (64-102399, default 64): Using default value 64 -Last sector, +sectors or +size{K,M,G} (64-102399, default 102399): -Command (m for help): Command action - e extended - p primary partition (1-4) -Partition number (1-4): First sector (20544-102399, default 20544): Using default value 20544 -Last sector, +sectors or +size{K,M,G} (20544-102399, default 102399): -Command (m for help): Command action - e extended - p primary partition (1-4) -Partition number (1-4): First sector (41024-102399, default 41024): Using default value 41024 -Last sector, +sectors or +size{K,M,G} (41024-102399, default 102399): -Command (m for help): Command action - e extended - p primary partition (1-4) -Selected partition 4 -First sector (61504-102399, default 61504): Using default value 61504 -Last sector, +sectors or +size{K,M,G} (61504-102399, default 102399): Using default value 102399 - -Command (m for help): First sector (61568-102399, default 61568): Using default value 61568 -Last sector, +sectors or +size{K,M,G} (61568-102399, default 102399): -Command (m for help): First sector (71872-102399, default 71872): Using default value 71872 -Last sector, +sectors or +size{K,M,G} (71872-102399, default 102399): -Command (m for help): First sector (82176-102399, default 82176): Using default value 82176 -Last sector, +sectors or +size{K,M,G} (82176-102399, default 102399): Using default value 102399 - -Command (m for help): -Disk /dev/sdb: 52 MB, 52428800 bytes -32 heads, 32 sectors/track, 100 cylinders, total 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 -Disk identifier: 0x817cb84a - - Device Boot Start End Blocks Id System -/dev/sdb1 64 20543 10240 83 Linux -/dev/sdb2 20544 41023 10240 83 Linux -/dev/sdb3 41024 61503 10240 83 Linux -/dev/sdb4 61504 102399 20448 5 Extended -/dev/sdb5 61568 71807 5120 83 Linux -/dev/sdb6 71872 82111 5120 83 Linux -/dev/sdb7 82176 102399 10112 83 Linux - -Command (m for help): The partition table has been altered! - -Calling ioctl() to re-read partition table. -Syncing disks. -Alignment offsets: -0 -0 -0 -0 -0 -0 -0 diff --git a/tests/expected/sfdisk/gpt-read-dump b/tests/expected/sfdisk/gpt-read-dump index ce7e5364c7..8e8f3b2be5 100644 --- a/tests/expected/sfdisk/gpt-read-dump +++ b/tests/expected/sfdisk/gpt-read-dump @@ -25,12 +25,12 @@ Device Start End Sectors Size Type The partition table has been altered. Calling ioctl() to re-read partition table. Syncing disks. -Disk /dev/sdb: 50 MiB, 52428800 bytes, 102400 sectors +Disk : 50 MiB, 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 Disklabel type: gpt -Disk identifier: 3B8559DB-33AF-43E9-BEFC-C331D829B539 +Disk identifier: Start End Size UUID Type Name 2048 8191 3M 4DD6948A-44F8-4E6C-8BDC-064F740704F8 Linux root (x86) diff --git a/tests/ts/sfdisk/gpt b/tests/ts/sfdisk/gpt index 90cb1a3661..19269b33bd 100755 --- a/tests/ts/sfdisk/gpt +++ b/tests/ts/sfdisk/gpt @@ -93,6 +93,7 @@ EOF ts_fdisk_clean $TS_DEVICE udevadm settle $TS_CMD_SFDISK --list -o START,END,SIZE,UUID,TYPE,NAME ${TS_DEVICE} >> $TS_OUTPUT 2>&1 +ts_fdisk_clean $TS_DEVICE ts_finalize_subtest