tests: explicitly define wipefs outpuit columns

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2017-06-29 13:31:35 +02:00
parent 050f8e357b
commit afeb1a8255
5 changed files with 15 additions and 15 deletions

View File

@ -25,5 +25,5 @@ Device Boot Start End Sectors Size Id Type
The partition table has been altered.
=====Check content================================
DEVICE OFFSET TYPE UUID LABEL
sdc 0x1fe dos
OFFSET TYPE
0x1fe dos

View File

@ -45,5 +45,5 @@ Device Boot Start End Sectors Size Id Type
The partition table has been altered.
=====Check content================================
DEVICE OFFSET TYPE UUID LABEL
sdc 0x1fe dos
OFFSET TYPE
0x1fe dos

View File

@ -52,5 +52,5 @@ Device Boot Start End Sectors Size Id Type
The partition table has been altered.
=====Check content================================
DEVICE OFFSET TYPE UUID LABEL
sdc 0x1fe dos
OFFSET TYPE
0x1fe dos

View File

@ -50,9 +50,9 @@ Calling ioctl() to re-read partition table.
Syncing disks.
=====Check content (disk)================================
DEVICE OFFSET TYPE UUID LABEL
sdc 0x1fe PMBR
sdc 0x31ffe00 gpt
sdc 0x200 gpt
OFFSET TYPE
0x1fe PMBR
0x31ffe00 gpt
0x200 gpt
=====Check content (partition)================================

View File

@ -41,7 +41,7 @@ echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --wipe=always --label=dos ${TS_DEVICE}
ts_fdisk_clean $TS_DEVICE
udevadm settle
ts_separator "Check content"
$TS_CMD_WIPEFS ${TS_DEVICE} >> $TS_OUTPUT 2>&1
$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> $TS_OUTPUT 2>&1
ts_finalize_subtest
@ -57,7 +57,7 @@ echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --label=dos ${TS_DEVICE} >> $TS_OUTPUT
ts_fdisk_clean $TS_DEVICE
udevadm settle
ts_separator "Check content"
$TS_CMD_WIPEFS ${TS_DEVICE} >> $TS_OUTPUT 2>&1
$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> $TS_OUTPUT 2>&1
ts_finalize_subtest
@ -72,7 +72,7 @@ echo ',,L' | $TS_CMD_SFDISK $SFDISK_OPTS --wipe=always --label=dos ${TS_DEVICE}
ts_fdisk_clean $TS_DEVICE
udevadm settle
ts_separator "Check content"
$TS_CMD_WIPEFS ${TS_DEVICE} >> $TS_OUTPUT 2>&1
$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> $TS_OUTPUT 2>&1
ts_finalize_subtest
@ -92,10 +92,10 @@ ts_separator "Create GPT (again)"
echo ',,L' | $TS_CMD_SFDISK --no-reread --wipe-partition=always --label=gpt ${TS_DEVICE} >> $TS_OUTPUT 2>&1
udevadm settle
ts_separator "Check content (disk)"
$TS_CMD_WIPEFS ${TS_DEVICE} >> $TS_OUTPUT 2>&1
$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE} >> $TS_OUTPUT 2>&1
udevadm settle
ts_separator "Check content (partition)"
$TS_CMD_WIPEFS ${TS_DEVICE}1 >> $TS_OUTPUT 2>&1
$TS_CMD_WIPEFS -O OFFSET,TYPE ${TS_DEVICE}1 >> $TS_OUTPUT 2>&1
ts_fdisk_clean $TS_DEVICE
ts_finalize_subtest