summaryrefslogtreecommitdiffstats
path: root/tests/ts/misc
diff options
context:
space:
mode:
authorKarel Zak2014-11-10 11:46:46 +0100
committerKarel Zak2014-11-10 11:46:46 +0100
commitb4d27255f24cddbdf3480ca0988dada340abe2d3 (patch)
tree5bf28329b4096180dec88995d7ffe349c5b8724c /tests/ts/misc
parentinclude/statfs_magic: use macro rather than type for f_type (diff)
downloadkernel-qcow2-util-linux-b4d27255f24cddbdf3480ca0988dada340abe2d3.tar.gz
kernel-qcow2-util-linux-b4d27255f24cddbdf3480ca0988dada340abe2d3.tar.xz
kernel-qcow2-util-linux-b4d27255f24cddbdf3480ca0988dada340abe2d3.zip
tests: simplify and update swaplabel test
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/misc')
-rwxr-xr-xtests/ts/misc/swaplabel8
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/ts/misc/swaplabel b/tests/ts/misc/swaplabel
index 052ee18fb..45f3bb9e2 100755
--- a/tests/ts/misc/swaplabel
+++ b/tests/ts/misc/swaplabel
@@ -41,18 +41,14 @@ fallocate_or_skip $(( $MIN_SWAP_SIZE - 1 )) $IMAGE
$TS_CMD_MKSWAP \
--label 1234567890abcdef \
--uuid 12345678-abcd-abcd-abcd-1234567890ab \
- $IMAGE 2>&1 |\
- sed "s/ $MIN_SWAP_SIZE_KB KiB/ 10 pages/" \
- >> $TS_OUTPUT 2>&1
+ $IMAGE >> $TS_OUTPUT 2>&1
rm -f $IMAGE
fallocate_or_skip $MIN_SWAP_SIZE $IMAGE
$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/" \
- >> $TS_OUTPUT 2>&1
+ $IMAGE >> $TS_OUTPUT 2>&1
$TS_CMD_SWAPLABEL $IMAGE >> $TS_OUTPUT 2>&1
#rm -f $IMAGE