summaryrefslogtreecommitdiffstats
path: root/tests/ts/misc
diff options
context:
space:
mode:
authorKarel Zak2016-01-26 16:02:54 +0100
committerKarel Zak2016-01-26 16:02:54 +0100
commitb35831b7558153993d6e5fd3cbec48376eeddaf1 (patch)
treeca68c748af9a16f610d745d790294b2af5c96748 /tests/ts/misc
parentlibmount: cleanup btrfs.c header (diff)
downloadkernel-qcow2-util-linux-b35831b7558153993d6e5fd3cbec48376eeddaf1.tar.gz
kernel-qcow2-util-linux-b35831b7558153993d6e5fd3cbec48376eeddaf1.tar.xz
kernel-qcow2-util-linux-b35831b7558153993d6e5fd3cbec48376eeddaf1.zip
tests: update swapfile output
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/misc')
-rwxr-xr-xtests/ts/misc/swaplabel4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/ts/misc/swaplabel b/tests/ts/misc/swaplabel
index 9bfc6896b..5653742aa 100755
--- a/tests/ts/misc/swaplabel
+++ b/tests/ts/misc/swaplabel
@@ -42,7 +42,8 @@ $TS_CMD_MKSWAP \
--label 1234567890abcdef \
--uuid 12345678-abcd-abcd-abcd-1234567890ab \
$IMAGE 2>&1 |\
- sed "s/ $MIN_SWAP_SIZE_KB KiB/ 10 pages/" \
+ sed -e "s/ $MIN_SWAP_SIZE_KB KiB/ 10 pages/" \
+ -e "s:$IMAGE:<swapfile>:g" \
>> $TS_OUTPUT 2>&1
rm -f $IMAGE
@@ -53,6 +54,7 @@ $TS_CMD_MKSWAP \
$IMAGE 2>&1 |\
sed -e "s/ $(( $MIN_SWAP_SIZE_KB - $PAGE_SIZE_KB )) KiB/ 9 pages/" \
-e "s/($(( $MIN_SWAP_SIZE - $PAGE_SIZE )) bytes)/(9xPGSZ bytes)/" \
+ -e "s:$IMAGE:<swapfile>:g" \
>> $TS_OUTPUT 2>&1
$TS_CMD_SWAPLABEL $IMAGE >> $TS_OUTPUT 2>&1