From 848f580287ce8463d4f0b86a1541307f9a2fcf13 Mon Sep 17 00:00:00 2001 From: Eryu Guan Date: Wed, 23 Mar 2016 17:39:11 +1100 Subject: [PATCH] fstests: make xfs/006 generic xfs/006 has no requirements that are specific to XFS, so make it generic and other filesystems could get some coverage too. Along with the movement, I also added a test that removes all created dirs, as that's how the original bug was found. Signed-off-by: Eryu Guan Reviewed-by: Christoph Hellwig Signed-off-by: Dave Chinner --- tests/{xfs/006 => generic/339} | 32 ++++++++++++++++++++------------ tests/generic/339.out | 2 ++ tests/generic/group | 1 + tests/xfs/006.out | 28 ---------------------------- tests/xfs/group | 1 - 5 files changed, 23 insertions(+), 41 deletions(-) rename tests/{xfs/006 => generic/339} (74%) create mode 100644 tests/generic/339.out delete mode 100644 tests/xfs/006.out diff --git a/tests/xfs/006 b/tests/generic/339 similarity index 74% rename from tests/xfs/006 rename to tests/generic/339 index 13631be1..cbcad004 100755 --- a/tests/xfs/006 +++ b/tests/generic/339 @@ -1,5 +1,5 @@ #! /bin/bash -# FS QA Test No. 006 +# FS QA Test No. 339 # # Test that directory hash entries are place in the correct order. # commit f5ea110 ("xfs: add CRCs to dir2/da node blocks") left the @@ -34,29 +34,37 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _cleanup() { - cd / - rm -f $tmp.* + cd / + rm -f $tmp.* } # get standard environment, filters and checks . ./common/rc . ./common/filter -. ./common/repair # real QA test starts here - -_supported_fs xfs +_supported_fs generic _supported_os Linux _require_scratch +_require_test_program "dirhash_collide" + +rm -f $seqres.full +_scratch_mkfs >>$seqres.full 2>&1 +_scratch_mount + +echo "Silence is golden" -_scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs -_scratch_mount | _filter_scratch +testdir=$SCRATCH_MNT/$seq.$$ +mkdir -p $testdir +$here/src/dirhash_collide -d -n 10000 $testdir >>$seqres.full 2>&1 -mkdir $SCRATCH_MNT/x -$here/src/dirhash_collide -d -n 10000 $SCRATCH_MNT/x -_scratch_unmount 2>&1 | _filter_scratch +# check the scratch device +_scratch_unmount +_check_scratch_fs -_scratch_xfs_repair 2>&1 | _filter_repair +# remove all test dirs and let test harness check scratch fs again +_scratch_mount +rm -rf $testdir # success, all done status=0 diff --git a/tests/generic/339.out b/tests/generic/339.out new file mode 100644 index 00000000..293ea808 --- /dev/null +++ b/tests/generic/339.out @@ -0,0 +1,2 @@ +QA output created by 339 +Silence is golden diff --git a/tests/generic/group b/tests/generic/group index 8818827d..cd2a2b76 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -341,3 +341,4 @@ 336 auto quick metadata 337 auto quick metadata 338 auto quick rw +339 auto dir diff --git a/tests/xfs/006.out b/tests/xfs/006.out deleted file mode 100644 index 9c142ac4..00000000 --- a/tests/xfs/006.out +++ /dev/null @@ -1,28 +0,0 @@ -QA output created by 006 -meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks -data = bsize=XXX blocks=XXX, imaxpct=PCT - = sunit=XXX swidth=XXX, unwritten=X -naming =VERN bsize=XXX -log =LDEV bsize=XXX blocks=XXX -realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX -Phase 1 - find and verify superblock... -Phase 2 - using log - - zero log... - - scan filesystem freespace and inode maps... - - found root inode chunk -Phase 3 - for each AG... - - scan and clear agi unlinked lists... - - process known inodes and perform inode discovery... - - process newly discovered inodes... -Phase 4 - check for duplicate blocks... - - setting up duplicate extent list... - - check for inodes claiming duplicate blocks... -Phase 5 - rebuild AG headers and trees... - - reset superblock... -Phase 6 - check inode connectivity... - - resetting contents of realtime bitmap and summary inodes - - traversing filesystem ... - - traversal finished ... - - moving disconnected inodes to lost+found ... -Phase 7 - verify and correct link counts... -done diff --git a/tests/xfs/group b/tests/xfs/group index a1f0c5b5..99913237 100644 --- a/tests/xfs/group +++ b/tests/xfs/group @@ -3,7 +3,6 @@ 003 db auto quick 004 db auto quick 005 auto quick -006 auto dir 007 auto quota quick 008 rw ioctl auto quick 009 rw ioctl auto prealloc quick -- 2.39.5