generic/495: split the test
PATCH 1/1 generic/495: split the test
Split each swap-file test into its own test. So on file-systems that do not support e.g. sparse files (exfat) other swap-file tests can be executed.
Signed-off-by Pavel Reichl <[email protected]>
--- tests/generic/495 | 14 ++---------- tests/generic/495.out | 3 --- tests/generic/634 | 50 +++++++++++++++++++++++++++++++++++++++++++ tests/generic/634.out | 2 ++ tests/generic/group | 1 + 5 files changed, 55 insertions(+), 15 deletions(-) create mode 100755 tests/generic/634 create mode 100644 tests/generic/634.out
tests/generic/495 +2 -12
@@ -4,7 +4,7 @@ # # FS QA Test 495 # -# Test invalid swap files. +# Test invalid swap file (with holes) # seq=`basename $0` seqres=$RESULT_DIR/$seq
@@ -32,11 +32,11 @@ _supported_fs generic _require_scratch_swapfile _require_test_program mkswap _require_test_program swapon +_require_sparse_files _scratch_mkfs >> $seqres.full 2>&1 _scratch_mount -echo "File with holes" # We can't use _format_swapfile because we're using our custom mkswap and # swapon. touch "$SCRATCH_MNT/swap"
@@ -47,15 +47,5 @@ $XFS_IO_PROG -c "truncate $(($(get_page_size) * 10))" "$SCRATCH_MNT/swap" "$here/src/swapon" "$SCRATCH_MNT/swap" swapoff "$SCRATCH_MNT/swap" >/dev/null 2>&1 -echo "Empty swap file (only swap header)" -rm -f "$SCRATCH_MNT/swap" -touch "$SCRATCH_MNT/swap" -$CHATTR_PROG +C "$SCRATCH_MNT/swap" >> $seqres.full 2>&1 -chmod 0600 "$SCRATCH_MNT/swap" -_pwrite_byte 0x61 0 $(get_page_size) "$SCRATCH_MNT/swap" >> $seqres.full -"$here/src/mkswap" "$SCRATCH_MNT/swap" -"$here/src/swapon" "$SCRATCH_MNT/swap" -swapoff "$SCRATCH_MNT/swap" >/dev/null 2>&1 - status=0 exit
tests/generic/495.out +0 -3
@@ -1,5 +1,2 @@ QA output created by 495 -File with holes -swapon: Invalid argument -Empty swap file (only swap header) swapon: Invalid argument
tests/generic/634 new file +50 -0
50 lines not on this page · raw message
tests/generic/634.out new file +2 -0
@@ -0,0 +1,2 @@ +QA output created by 634 +swapon: Invalid argument
tests/generic/group +1 -0
@@ -636,3 +636,4 @@ 631 auto rw overlay rename 632 auto quick mount 633 auto quick atime attr cap idmapped io_uring mount perms rw unlink +634 auto quick swap
Signature · 1 line
2.30.2
Quoted 15 lines · Pavel Reichl
Split each swap-file test into its own test. So on file-systems that do not support e.g. sparse files (exfat) other swap-file tests can be executed.
Signed-off-by Pavel Reichl <[email protected]>--- tests/generic/495 | 14 ++---------- tests/generic/495.out | 3 --- tests/generic/634 | 50 +++++++++++++++++++++++++++++++++++++++++++ tests/generic/634.out | 2 ++ tests/generic/group | 1 + 5 files changed, 55 insertions(+), 15 deletions(-) create mode 100755 tests/generic/634 create mode 100644 tests/generic/634.out
...
Quoted 36 lines
tests/generic/634 new file +30
-0@@ -0,0 +1,50 @@ +#! /bin/bash +# SPDX-License-Identifier: GPL-2.0 +# Copyright (c) 2018 Facebook. All Rights Reserved. +# +# FS QA Test 634 +# +# Test invalid swap files. +# Empty swap file (only swap header) +# +seq=`basename $0` +seqres=$RESULT_DIR/$seq +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_cleanup() +{ + cd / + rm -f $tmp.* +} + +# get standard environment, filters and checks +. ./common/rc +. ./common/filter + +# remove previous $seqres.full before test +rm -f $seqres.full
tests/generic/634 line 40
Quoted 10 lines
tests/generic/634 new file +10
-0+ +_supported_fs generic +_require_scratch_swapfile +_require_test_program mkswap +_require_test_program swapon + +_scratch_mkfs >> $seqres.full 2>&1 +_scratch_mount + +rm -f "$SCRATCH_MNT/swap"
This looks spurious now that the fs is initially clean. Otherwise LGTM:
Reviewed-by Brian Foster <[email protected]>
Quoted 30 lines
tests/generic/634 new file +10
-0+touch "$SCRATCH_MNT/swap" +$CHATTR_PROG +C "$SCRATCH_MNT/swap" >> $seqres.full 2>&1 +chmod 0600 "$SCRATCH_MNT/swap" +_pwrite_byte 0x61 0 $(get_page_size) "$SCRATCH_MNT/swap" >> $seqres.full +"$here/src/mkswap" "$SCRATCH_MNT/swap" +"$here/src/swapon" "$SCRATCH_MNT/swap" +swapoff "$SCRATCH_MNT/swap" >/dev/null 2>&1 + +status=0 +exittests/generic/634.out new file +2
-0@@ -0,0 +1,2 @@ +QA output created by 634 +swapon: Invalid argumenttests/generic/group +1
-0@@ -636,3 +636,4 @@ 631 auto rw overlay rename 632 auto quick mount 633 auto quick atime attr cap idmapped io_uring mount perms rw unlink +634 auto quick swapSignature · 1 line
2.30.2
Quoted 1 line · Brian Foster
On Wed, Apr 21, 2021 at 12:30:44AM +0200, Pavel Reichl wrote:
...
Quoted 7 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ +rm -f "$SCRATCH_MNT/swap"This looks spurious now that the fs is initially clean. Otherwise LGTM:
Reviewed-by Brian Foster <[email protected]>
Hi Brian, thanks for the review - your comment was addressed in v2 of this patch, which is on the list already, thanks!