shared,ext4: move ext4-specific tests out of shared/

The tests shared/{001,003,004,272} test behaviour around the ext4's
journal.  As such, they are pointless to run on ext2, and ext3 no
longer is in kernels newer than 4.3.  (And most enterprise
distributions have been using ext4 to support the ext3 file system;
that capability has been around since 2.6.33.)  So we can move these
tests out of shared and into the ext4 class of tests:

	shared/001 --> ext4/036
	shared/003 --> ext4/037
	shared/004 --> ext4/038
	shared/272 --> ext4/039

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/tests/shared/001 b/tests/ext4/036
similarity index 91%
rename from tests/shared/001
rename to tests/ext4/036
index bde6e1987d90fa8c485326064dbe137897099006..1d1700114c7da0596c9f53fdd6e7160bbabd79c6 100755 (executable)
--- a/tests/shared/001
+++ b/tests/ext4/036
@@ -2,9 +2,9 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (c) 2015 Red Hat Inc.  All Rights Reserved.
 #
-# FS QA Test No. 001
+# FS QA Test No. ext4/036
 #
-# Test truncate orphan inodes when mounting extN.
+# Test truncate orphan inodes when mounting ext4
 # ext4 used to hit WARNING, this commit fixed the issue
 #
 # 721e3eb ext4: lock i_mutex when truncating orphan inodes
@@ -29,7 +29,7 @@ _cleanup()
 . ./common/filter
 
 # real QA test starts here
-_supported_fs ext2 ext3 ext4
+_supported_fs ext3 ext4
 _supported_os Linux
 _require_scratch
 

diff --git a/tests/ext4/036.out b/tests/ext4/036.out
new file mode 100644 (file)
index 0000000..ed460d9
--- /dev/null
+++ b/tests/ext4/036.out
@@ -0,0 +1,2 @@
+QA output created by 036
+Silence is golden

diff --git a/tests/shared/003 b/tests/ext4/037
similarity index 93%
rename from tests/shared/003
rename to tests/ext4/037
index 761b9691d4ccf638d6d5bc800cfbf1ddbe25b8d4..939450947bc7237dad357f29446fa7e3ca3d07d5 100755 (executable)
--- a/tests/shared/003
+++ b/tests/ext4/037
@@ -2,15 +2,13 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (c) 2015 Red Hat Inc.  All Rights Reserved.
 #
-# FS QA Test 003
+# FS QA Test ext4/037
 #
 # Test mount a needs_recovery partition with noload option.
 # ext4 used to Oops until part of this commit:
 #
 # 744692d ext4: use ext4_get_block_write in buffer write
 #
-# Also test on ext2/3.
-#
 seq=`basename $0`
 seqres=$RESULT_DIR/$seq
 echo "QA output created by $seq"
@@ -31,7 +29,7 @@ _cleanup()
 . ./common/filter
 
 # real QA test starts here
-_supported_fs ext2 ext3 ext4
+_supported_fs ext3 ext4
 _supported_os Linux
 
 # nofsck as we modify sb via debugfs

diff --git a/tests/ext4/037.out b/tests/ext4/037.out
new file mode 100644 (file)
index 0000000..5c3a30a
--- /dev/null
+++ b/tests/ext4/037.out
@@ -0,0 +1,2 @@
+QA output created by 037
+Silence is golden

diff --git a/tests/shared/004 b/tests/ext4/038
similarity index 95%
rename from tests/shared/004
rename to tests/ext4/038
index 3021c85d51eb1b7e9f043b0abfe35fadfa60c747..5569c791ef2668b1b72a9dde1a5debcc07b3215e 100755 (executable)
--- a/tests/shared/004
+++ b/tests/ext4/038
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (c) 2016 Fujitsu.  All Rights Reserved.
 #
-# FS QA Test 004
+# FS QA Test ext4/038
 #
 # Regression test for commit:
 # c9eb13a ext4: fix hang when processing corrupted orphaned inode list
@@ -25,7 +25,7 @@ _cleanup()
 . ./common/rc
 
 # real QA test starts here
-_supported_fs ext2 ext3 ext4
+_supported_fs ext3 ext4
 _supported_os Linux
 _require_scratch
 _require_command "$DEBUGFS_PROG" debugfs

diff --git a/tests/ext4/038.out b/tests/ext4/038.out
new file mode 100644 (file)
index 0000000..5e0f13e
--- /dev/null
+++ b/tests/ext4/038.out
@@ -0,0 +1,2 @@
+QA output created by 038
+Silence is golden

diff --git a/tests/shared/272 b/tests/ext4/039
similarity index 98%
rename from tests/shared/272
rename to tests/ext4/039
index b94dfc3c3d870be4fe4b76b145205d6f09508758..d2850146a4ddbb09fe946d4bcc5e53cc881667d8 100755 (executable)
--- a/tests/shared/272
+++ b/tests/ext4/039
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (c) 2006 Silicon Graphics, Inc.  All Rights Reserved.
 #
-# FSQA Test No. 272
+# FSQA Test No. ext4/039
 #
 # Test data journaling flag switch for a single file  
 #

diff --git a/tests/shared/272.out b/tests/ext4/039.out
similarity index 72%
rename from tests/shared/272.out
rename to tests/ext4/039.out
index a9eaf84c43e6c50fd8d4758835317a2c4cd999d8..2c8aabadc9149ceee06d97db852912121df8fc05 100644 (file)
--- a/tests/shared/272.out
+++ b/tests/ext4/039.out
@@ -1,3 +1,3 @@
-QA output created by 272
+QA output created by 039
 Switch data journalling mode. Silence is golden.
 Check filesystem

diff --git a/tests/ext4/group b/tests/ext4/group
index d27ec893333b7152968ab8918fbac26e5f7be188..6418d82d01865f9a0d6b95b96db1e3aac393b30c 100644 (file)
--- a/tests/ext4/group
+++ b/tests/ext4/group
@@ -38,6 +38,10 @@
 033 auto ioctl resize
 034 auto quick quota
 035 auto quick resize
+036 auto quick
+037 auto quick
+038 auto quick
+039 auto enospc rw
 271 auto rw quick
 301 aio auto ioctl rw stress defrag
 302 aio auto ioctl rw stress defrag

diff --git a/tests/shared/001.out b/tests/shared/001.out
deleted file mode 100644 (file)
index 88678b8..0000000
--- a/tests/shared/001.out
+++ /dev/null
@@ -1,2 +0,0 @@
-QA output created by 001
-Silence is golden

diff --git a/tests/shared/003.out b/tests/shared/003.out
deleted file mode 100644 (file)
index 6895fc8..0000000
--- a/tests/shared/003.out
+++ /dev/null
@@ -1,2 +0,0 @@
-QA output created by 003
-Silence is golden

diff --git a/tests/shared/004.out b/tests/shared/004.out
deleted file mode 100644 (file)
index af8614a..0000000
--- a/tests/shared/004.out
+++ /dev/null
@@ -1,2 +0,0 @@
-QA output created by 004
-Silence is golden

diff --git a/tests/shared/group b/tests/shared/group
index b091d9111359e755c4f4254a0fcbae67352c6c2d..6f184946bd67cc05be8cb6a654e5626d87213ca2 100644 (file)
--- a/tests/shared/group
+++ b/tests/shared/group
@@ -3,10 +3,7 @@
 # - do not start group names with a digit
 # - comment line before each group is "new" description
 #
-001 auto quick
 002 auto metadata quick log
-003 auto quick
-004 auto quick
 005 dangerous_fuzzers
 006 auto enospc
 007 dangerous_fuzzers
@@ -15,6 +12,5 @@
 010 auto stress dedupe
 011 auto quick
 032 mkfs auto quick
-272 auto enospc rw
 289 auto quick
 298 auto trim