From: Karel Zak Date: Wed, 12 Jul 2017 10:34:22 +0000 (+0200) Subject: tests: don't use errno in output X-Git-Tag: v2.31-rc1~210 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=288acb4eee57846634e0e9a63edce10126579563;p=thirdparty%2Futil-linux.git tests: don't use errno in output Signed-off-by: Karel Zak --- diff --git a/libfdisk/samples/mkpart-fullspec.c b/libfdisk/samples/mkpart-fullspec.c index 2096181c79..041bf2cec0 100644 --- a/libfdisk/samples/mkpart-fullspec.c +++ b/libfdisk/samples/mkpart-fullspec.c @@ -153,7 +153,7 @@ int main(int argc, char *argv[]) rc = fdisk_add_partition(cxt, pa, NULL); if (rc) { errno = -rc; - err(EXIT_FAILURE, "failed to add #%d partition", partno); + errx(EXIT_FAILURE, "failed to add #%d partition", partno); } fdisk_reset_partition(pa); diff --git a/libfdisk/samples/mkpart.c b/libfdisk/samples/mkpart.c index 8498cb9065..7871015cf8 100644 --- a/libfdisk/samples/mkpart.c +++ b/libfdisk/samples/mkpart.c @@ -170,7 +170,7 @@ int main(int argc, char *argv[]) rc = fdisk_add_partition(cxt, pa, NULL); if (rc) { errno = -rc; - err(EXIT_FAILURE, "failed to add #%d partition", n + 1); + errx(EXIT_FAILURE, "failed to add #%d partition", n + 1); } fdisk_reset_partition(pa); diff --git a/tests/expected/libfdisk/mkpart-full-gpt-err-overlap b/tests/expected/libfdisk/mkpart-full-gpt-err-overlap index aea49cd5a2..6733392309 100644 --- a/tests/expected/libfdisk/mkpart-full-gpt-err-overlap +++ b/tests/expected/libfdisk/mkpart-full-gpt-err-overlap @@ -7,7 +7,7 @@ Created a new . Created a new . Created a new . Sector 5000 already used. -sample-fdisk-mkpart-fullspec: failed to add #4 partition: Numerical result out of range +sample-fdisk-mkpart-fullspec: failed to add #4 partition Disk : 15 MiB, 15728640 bytes, 30720 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/libfdisk/mkpart-full-mbr-err-logical b/tests/expected/libfdisk/mkpart-full-mbr-err-logical index b2249c8678..c2c0b0df62 100644 --- a/tests/expected/libfdisk/mkpart-full-mbr-err-logical +++ b/tests/expected/libfdisk/mkpart-full-mbr-err-logical @@ -4,7 +4,7 @@ Requested partition: Requested partition: Requested partition: Requested partition: -sample-fdisk-mkpart-fullspec: failed to add #6 partition: Invalid argument +sample-fdisk-mkpart-fullspec: failed to add #6 partition Created a new . Created a new . Created a new . diff --git a/tests/expected/libfdisk/mkpart-full-mbr-err-nospace b/tests/expected/libfdisk/mkpart-full-mbr-err-nospace index cc243befb9..d7a0065699 100644 --- a/tests/expected/libfdisk/mkpart-full-mbr-err-nospace +++ b/tests/expected/libfdisk/mkpart-full-mbr-err-nospace @@ -5,7 +5,7 @@ Created a new . Created a new . Created a new . Start sector 4096 out of range. -sample-fdisk-mkpart-fullspec: failed to add #3 partition: Numerical result out of range +sample-fdisk-mkpart-fullspec: failed to add #3 partition Disk : 15 MiB, 15728640 bytes, 30720 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes diff --git a/tests/expected/libfdisk/mkpart-full-mbr-err-primary b/tests/expected/libfdisk/mkpart-full-mbr-err-primary index aeb4bc7d8d..1142f65312 100644 --- a/tests/expected/libfdisk/mkpart-full-mbr-err-primary +++ b/tests/expected/libfdisk/mkpart-full-mbr-err-primary @@ -5,7 +5,7 @@ Created a new . Created a new . Created a new . Extended partition does not exists. Failed to add logical partition. -sample-fdisk-mkpart-fullspec: failed to add #7 partition: Invalid argument +sample-fdisk-mkpart-fullspec: failed to add #7 partition Disk : 15 MiB, 15728640 bytes, 30720 sectors Units: sectors of 1 * 512 = 512 bytes Sector size (logical/physical): 512 bytes / 512 bytes