From: Karel Zak Date: Thu, 23 Apr 2015 13:08:26 +0000 (+0200) Subject: tests: fix sfdisk GPT test X-Git-Tag: v2.27-rc1~243 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2381bdac86bb5fc27fe12ff9994268ea68888dc;p=thirdparty%2Futil-linux.git tests: fix sfdisk GPT test The test uses too large last partition, libfdisk checks this problem now. Signed-off-by: Karel Zak --- diff --git a/tests/expected/sfdisk/gpt-read-dump b/tests/expected/sfdisk/gpt-read-dump index 8e8f3b2be5..704bdd9f76 100644 --- a/tests/expected/sfdisk/gpt-read-dump +++ b/tests/expected/sfdisk/gpt-read-dump @@ -20,7 +20,7 @@ Device Start End Sectors Size Type 1 2048 8191 6144 3M Linux root (x86) 2 8192 14335 6144 3M Linux filesystem 3 14336 20479 6144 3M Linux filesystem -4 20480 102399 81920 40M Linux filesystem +4 20480 102366 81887 40M Linux filesystem The partition table has been altered. Calling ioctl() to re-read partition table. @@ -36,4 +36,4 @@ Start End Size UUID Type Name 2048 8191 3M 4DD6948A-44F8-4E6C-8BDC-064F740704F8 Linux root (x86) 8192 14335 3M 44B51DEF-5F04-465A-91AA-2889A62D8E49 Linux filesystem 14336 20479 3M 643E1D0D-BC02-4CED-B83B-86121062858F Linux filesystem -20480 102399 40M D2A29B0A-FDEE-40C3-9BAE-B9FA782C986C Linux filesystem GPT is the best +20480 102366 40M D2A29B0A-FDEE-40C3-9BAE-B9FA782C986C Linux filesystem GPT is the best diff --git a/tests/expected/sfdisk/gpt-write-dump b/tests/expected/sfdisk/gpt-write-dump index bc4a7b96a5..3ad79259f6 100644 --- a/tests/expected/sfdisk/gpt-write-dump +++ b/tests/expected/sfdisk/gpt-write-dump @@ -8,4 +8,4 @@ last-lba: 102366 1 : start= 2048, size= 6144, type=44479540-F297-41B2-9AF7-D131D5F0458A, uuid=4DD6948A-44F8-4E6C-8BDC-064F740704F8 2 : start= 8192, size= 6144, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=44B51DEF-5F04-465A-91AA-2889A62D8E49 3 : start= 14336, size= 6144, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=643E1D0D-BC02-4CED-B83B-86121062858F -4 : start= 20480, size= 81920, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=D2A29B0A-FDEE-40C3-9BAE-B9FA782C986C, name="GPT is the best" +4 : start= 20480, size= 81887, type=0FC63DAF-8483-4772-8E79-3D69D8477DE4, uuid=D2A29B0A-FDEE-40C3-9BAE-B9FA782C986C, name="GPT is the best" diff --git a/tests/ts/sfdisk/gpt b/tests/ts/sfdisk/gpt index de1184c944..c6f9e95c24 100755 --- a/tests/ts/sfdisk/gpt +++ b/tests/ts/sfdisk/gpt @@ -89,7 +89,7 @@ label-id: 3b8559db-33af-43e9-befc-c331d829b539 ${TS_DEVICE}1 : start=2048, size=6144, type=44479540-F297-41B2-9AF7-D131D5F0458A, uuid=4dd6948a-44f8-4e6c-8bdc-064f740704f8 ${TS_DEVICE}2 : start=8192, size=6144, uuid=44b51def-5f04-465a-91aa-2889a62d8e49 ${TS_DEVICE}3 : start=14336, size=6144, uuid=643e1d0d-bc02-4ced-b83b-86121062858f -${TS_DEVICE}4 : start=20480, size=81920,uuid=d2a29b0a-fdee-40c3-9bae-b9fa782c986c, name="GPT is the best" +${TS_DEVICE}4 : start=20480, size=81887,uuid=d2a29b0a-fdee-40c3-9bae-b9fa782c986c, name="GPT is the best" EOF ts_fdisk_clean $TS_DEVICE udevadm settle