Re: [PATCH 2/3] tests: fix swaplabel test for 9a83b03c

[Ruediger Meier <sweet_f_a@gmx.de>]

On Monday 26 January 2015, Ruediger Meier wrote:
> From: Ruediger Meier <ruediger.meier@ga-group.nl>
>
> Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
> ---
>  tests/expected/misc/swaplabel | 2 +-
>  tests/ts/misc/swaplabel       | 3 ++-
>  2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/tests/expected/misc/swaplabel
> b/tests/expected/misc/swaplabel index fd442af..623139e 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 052ee18..8f29360 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/($((9 * $PAGE_SIZE)) bytes)/(9xPGSZ bytes)/" \ 

... just updated this line to
+	    -e "s/($(( $MIN_SWAP_SIZE - $PAGE_SIZE)) bytes)/(9xPGSZ bytes)/" \
(github pull request #147)

>
>  	>> $TS_OUTPUT 2>&1
>
>  $TS_CMD_SWAPLABEL $IMAGE >> $TS_OUTPUT 2>&1