From: Ruediger Meier Date: Mon, 26 Jan 2015 13:19:31 +0000 (+0100) Subject: tests: fix swaplabel test for 9a83b03c X-Git-Tag: v2.26-rc2~64^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89342005bc1a451e379e92b2f9ec60390d628f30;p=thirdparty%2Futil-linux.git tests: fix swaplabel test for 9a83b03c Signed-off-by: Ruediger Meier --- diff --git a/tests/expected/misc/swaplabel b/tests/expected/misc/swaplabel index fd442afbef..623139e474 100644 --- a/tests/expected/misc/swaplabel +++ b/tests/expected/misc/swaplabel @@ -1,6 +1,6 @@ mkswap: error: swap area needs to be at least 10 pages mkswap: Label was truncated. -Setting up swapspace version 1, size = 9 pages +Setting up swapspace version 1, size = 9 pages (9xPGSZ bytes) LABEL=1234567890abcde, UUID=12345678-abcd-abcd-abcd-1234567890ab LABEL: 1234567890abcde UUID: 12345678-abcd-abcd-abcd-1234567890ab diff --git a/tests/ts/misc/swaplabel b/tests/ts/misc/swaplabel index 052ee18fbf..9bfc6896b3 100755 --- a/tests/ts/misc/swaplabel +++ b/tests/ts/misc/swaplabel @@ -51,7 +51,8 @@ $TS_CMD_MKSWAP \ --label 1234567890abcdef \ --uuid 12345678-abcd-abcd-abcd-1234567890ab \ $IMAGE 2>&1 |\ - sed "s/ $(( $MIN_SWAP_SIZE_KB - $PAGE_SIZE_KB )) KiB/ 9 pages/" \ + sed -e "s/ $(( $MIN_SWAP_SIZE_KB - $PAGE_SIZE_KB )) KiB/ 9 pages/" \ + -e "s/($(( $MIN_SWAP_SIZE - $PAGE_SIZE )) bytes)/(9xPGSZ bytes)/" \ >> $TS_OUTPUT 2>&1 $TS_CMD_SWAPLABEL $IMAGE >> $TS_OUTPUT 2>&1