diff options
| author | Karel Zak | 2014-10-14 17:10:11 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-10-14 17:10:11 +0200 |
| commit | 3df4adac3e65e9e203c547d2f749e0c7cbab29a5 (patch) | |
| tree | 9a52a2db97eaded30674a0af7bc74875dc46e342 /tests/ts/fdisk | |
| parent | libfdisk: (dos) fix N-1 error for partition size (diff) | |
| download | kernel-qcow2-util-linux-3df4adac3e65e9e203c547d2f749e0c7cbab29a5.tar.gz kernel-qcow2-util-linux-3df4adac3e65e9e203c547d2f749e0c7cbab29a5.tar.xz kernel-qcow2-util-linux-3df4adac3e65e9e203c547d2f749e0c7cbab29a5.zip | |
tests: update fdisk formatting
fdisk --list does no more use extra linebreak (\n) before
and after partition table entries.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/fdisk')
| -rwxr-xr-x | tests/ts/fdisk/bsd | 4 | ||||
| -rwxr-xr-x | tests/ts/fdisk/gpt | 2 | ||||
| -rwxr-xr-x | tests/ts/fdisk/mbr-dos-mode | 2 | ||||
| -rwxr-xr-x | tests/ts/fdisk/mbr-nondos-mode | 2 | ||||
| -rwxr-xr-x | tests/ts/fdisk/mbr-sort | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/tests/ts/fdisk/bsd b/tests/ts/fdisk/bsd index d5ec215a4..1d5f9a11a 100755 --- a/tests/ts/fdisk/bsd +++ b/tests/ts/fdisk/bsd @@ -68,13 +68,13 @@ function fdisk_bsd_offset_and_byte_order_clean } function print_layout { - echo -ne "\n---layout----------" >> $TS_OUTPUT + echo -ne "\n---layout----------\n" >> $TS_OUTPUT $TS_CMD_FDISK -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT echo -ne "-------------------\n\n" >> $TS_OUTPUT } function print_bsd_layout { - echo -ne "\n---layout----------" >> $TS_OUTPUT + echo -ne "\n---layout----------\n" >> $TS_OUTPUT echo -e "${FDISK_CMD_BSD_LIST}" | \ $TS_CMD_FDISK ${TEST_IMAGE_NAME} >> $TS_OUTPUT echo -ne "-------------------\n\n" >> $TS_OUTPUT diff --git a/tests/ts/fdisk/gpt b/tests/ts/fdisk/gpt index 3c174e968..fd9c23e07 100755 --- a/tests/ts/fdisk/gpt +++ b/tests/ts/fdisk/gpt @@ -35,7 +35,7 @@ FDISK_CMD_DELETE_PART="d\n2\n" # delete 2nd partition FDISK_CMD_CREATE_PART="n\n2\n\n\n" # create 2nd partition function print_layout { - echo -ne "\n---layout----------" >> $TS_OUTPUT + echo -ne "\n---layout----------\n" >> $TS_OUTPUT $TS_CMD_FDISK -l ${TEST_IMAGE_NAME} &>> $TS_OUTPUT echo -ne "-------------------\n\n" >> $TS_OUTPUT } diff --git a/tests/ts/fdisk/mbr-dos-mode b/tests/ts/fdisk/mbr-dos-mode index 6d517ea3e..4fad8da77 100755 --- a/tests/ts/fdisk/mbr-dos-mode +++ b/tests/ts/fdisk/mbr-dos-mode @@ -39,7 +39,7 @@ FDISK_CMD_DELETE_EXTENDED="d\n2\n" # delete second primary FDISK_OPTIONS="-C 1024 -c=dos -u=cylinders" function print_layout { - echo -ne "\n---layout----------" >> $TS_OUTPUT + echo -ne "\n---layout----------\n" >> $TS_OUTPUT $TS_CMD_FDISK ${FDISK_OPTIONS} -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT echo -ne "-------------------\n\n" >> $TS_OUTPUT } diff --git a/tests/ts/fdisk/mbr-nondos-mode b/tests/ts/fdisk/mbr-nondos-mode index 9c38f3aff..f39b5e0f0 100755 --- a/tests/ts/fdisk/mbr-nondos-mode +++ b/tests/ts/fdisk/mbr-nondos-mode @@ -37,7 +37,7 @@ FDISK_CMD_DELETE_2PRIMARY="d\n2\n" # delete first primary FDISK_CMD_DELETE_EXTENDED="d\n3\n" # delete second primary function print_layout { - echo -ne "\n---layout----------" >> $TS_OUTPUT + echo -ne "\n---layout----------\n" >> $TS_OUTPUT $TS_CMD_FDISK -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT echo -ne "-------------------\n\n" >> $TS_OUTPUT } diff --git a/tests/ts/fdisk/mbr-sort b/tests/ts/fdisk/mbr-sort index 3166d867b..2cdb11557 100755 --- a/tests/ts/fdisk/mbr-sort +++ b/tests/ts/fdisk/mbr-sort @@ -39,7 +39,7 @@ FDISK_CMD_CREATE_4LOGICAL="n\n10240\n12287\n" FDISK_CMD_EXPERT_SORT="x\nf\nr\n" function print_layout { - echo -ne "\n---layout----------" >> $TS_OUTPUT + echo -ne "\n---layout----------\n" >> $TS_OUTPUT $TS_CMD_FDISK -l ${TEST_IMAGE_NAME} >> $TS_OUTPUT echo -ne "-------------------\n\n" >> $TS_OUTPUT } |