From: Darrick J. Wong Date: Wed, 28 Apr 2021 04:09:35 +0000 (-0700) Subject: xfs/419: remove irrelevant swapfile test X-Git-Tag: v2022.05.01~426 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9abb8f44ca6c8f1b99af2f77bac46ade140f922f;p=xfstests-dev.git xfs/419: remove irrelevant swapfile test Since the advent of iomap_swapfile_activate in XFS, we actually /do/ support having swap files on the realtime device. Remove this test. Signed-off-by: Darrick J. Wong Reviewed-by: Brian Foster Signed-off-by: Eryu Guan --- diff --git a/tests/xfs/419 b/tests/xfs/419 deleted file mode 100755 index fc7174bd..00000000 --- a/tests/xfs/419 +++ /dev/null @@ -1,58 +0,0 @@ -#! /bin/bash -# SPDX-License-Identifier: GPL-2.0 -# Copyright (c) 2017 Oracle, Inc. All Rights Reserved. -# -# FS QA Test No. 419 -# -# Check that we can't swapon a realtime file. -# -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 7 15 - -_cleanup() -{ - cd / - rm -rf $tmp.* -} - -# get standard environment, filters and checks -. ./common/rc -. ./common/filter - -# real QA test starts here -_supported_fs xfs -_require_realtime -_require_scratch_swapfile - -echo "Format and mount" -_scratch_mkfs > $seqres.full 2>&1 -_scratch_mount >> $seqres.full 2>&1 - -testdir=$SCRATCH_MNT/test-$seq -mkdir $testdir - -blocks=160 -blksz=65536 - -echo "Initialize file" -echo >> $seqres.full -$XFS_IO_PROG -c "open -f -R $testdir/dummy" $testdir >> $seqres.full -echo moo >> $testdir/dummy -$XFS_IO_PROG -c "open -f -R $testdir/file1" $testdir >> $seqres.full -_pwrite_byte 0x61 0 $((blocks * blksz)) $testdir/file1 >> $seqres.full -$MKSWAP_PROG -U 27376b42-ff65-42ca-919f-6c9b62292a5c $testdir/file1 >> $seqres.full - -echo "Try to swapon" -swapon $testdir/file1 2>&1 | _filter_scratch - -swapoff $testdir/file1 >> $seqres.full 2>&1 - -# success, all done -status=0 -exit diff --git a/tests/xfs/419.out b/tests/xfs/419.out deleted file mode 100644 index 83b7dd45..00000000 --- a/tests/xfs/419.out +++ /dev/null @@ -1,5 +0,0 @@ -QA output created by 419 -Format and mount -Initialize file -Try to swapon -swapon: SCRATCH_MNT/test-419/file1: swapon failed: Invalid argument diff --git a/tests/xfs/group b/tests/xfs/group index 09924de9..7d2ab08e 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -409,7 +409,6 @@ 416 dangerous_fuzzers dangerous_scrub dangerous_repair 417 dangerous_fuzzers dangerous_scrub dangerous_online_repair 418 dangerous_fuzzers dangerous_scrub dangerous_repair -419 auto quick swap realtime 420 auto quick clone punch seek 421 auto quick clone punch seek 422 dangerous_scrub dangerous_online_repair