From a9868eb48d627e7b170e33257a9b7a1326336786 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Fri, 28 Jun 2019 18:59:09 -0400 Subject: [PATCH] shared,generic: move shared/006 to generic/ The shared/006 uses _scratch_mkfs_sized to create a limited size file system, and then creates inodes until it gets ENOSPC, and then checks to make sure the file system is consistent. It then remounts the file system, removes all of the files, and makes sure the file system is consistent afterwards. This test was marked as only being supported on ext[234] and xfs, and so it was in shared. Now introduce a new _require_inode_limits() rule to run test on filesystems that have a fixed inode number, then move the test to generic. Signed-off-by: Theodore Ts'o Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- common/rc | 7 +++++++ tests/{shared/006 => generic/558} | 7 +++---- tests/generic/558.out | 2 ++ tests/generic/group | 1 + tests/shared/006.out | 2 -- tests/shared/group | 1 - 6 files changed, 13 insertions(+), 7 deletions(-) rename tests/{shared/006 => generic/558} (95%) create mode 100644 tests/generic/558.out delete mode 100644 tests/shared/006.out diff --git a/common/rc b/common/rc index 25203bb4..dcd591b3 100644 --- a/common/rc +++ b/common/rc @@ -3997,6 +3997,13 @@ _require_scratch_btime() _scratch_unmount } +_require_inode_limits() +{ + if [ $(_get_free_inode $TEST_DIR) -eq 0 ]; then + _notrun "$FSTYP does not have a fixed number of inodes available" + fi +} + _require_filefrag_options() { _require_command "$FILEFRAG_PROG" filefrag diff --git a/tests/shared/006 b/tests/generic/558 similarity index 95% rename from tests/shared/006 rename to tests/generic/558 index aa65e9a2..c05aa961 100755 --- a/tests/shared/006 +++ b/tests/generic/558 @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2014 Red Hat Inc. All Rights Reserved. # -# FS QA Test No. shared/006 +# FS QA Test No. generic/558 # # Stress test fs by using up all inodes and check fs. # @@ -42,10 +42,9 @@ create_file() . ./common/filter # real QA test starts here -_supported_fs ext4 ext3 ext2 xfs +_supported_fs generic _supported_os Linux - -_require_scratch +_require_inode_limits rm -f $seqres.full echo "Silence is golden" diff --git a/tests/generic/558.out b/tests/generic/558.out new file mode 100644 index 00000000..9a6c4e79 --- /dev/null +++ b/tests/generic/558.out @@ -0,0 +1,2 @@ +QA output created by 558 +Silence is golden diff --git a/tests/generic/group b/tests/generic/group index 543c0627..8fc85b63 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -560,3 +560,4 @@ 555 auto quick cap 556 auto quick casefold 557 auto quick log +558 auto enospc diff --git a/tests/shared/006.out b/tests/shared/006.out deleted file mode 100644 index 675c1b7c..00000000 --- a/tests/shared/006.out +++ /dev/null @@ -1,2 +0,0 @@ -QA output created by 006 -Silence is golden diff --git a/tests/shared/group b/tests/shared/group index 3507d7d4..2cf910bd 100644 --- a/tests/shared/group +++ b/tests/shared/group @@ -4,7 +4,6 @@ # - comment line before each group is "new" description # 002 auto metadata quick log -006 auto enospc 008 auto stress dedupe 009 auto stress dedupe 010 auto stress dedupe -- 2.30.2