From: Darrick J. Wong <djwong@xxxxxxxxxx> Migrate all the test group information into the test files. This patch has been autogenerated via the command: ./tools/convert-group btrfs ceph cifs ext4 f2fs generic nfs ocfs2 overlay perf shared udf xfs (NOTE: I truncated this patch to the first five conversions because nobody wants to read a 1MB patch LOL) Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> --- tests/btrfs/001 | 8 ++------ tests/btrfs/002 | 8 ++------ tests/btrfs/003 | 8 ++------ tests/btrfs/004 | 8 ++------ 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/tests/btrfs/001 b/tests/btrfs/001 index fb051e8a..2248b6f6 100755 --- a/tests/btrfs/001 +++ b/tests/btrfs/001 @@ -6,13 +6,9 @@ # # Test btrfs's subvolume and snapshot support # -seq=`basename $0` -seqres=$RESULT_DIR/$seq -echo "QA output created by $seq" +. ./common/test_names +_set_seq_and_groups auto quick subvol snapshot -here=`pwd` -tmp=/tmp/$$ -status=1 # failure is the default! _cleanup() { diff --git a/tests/btrfs/002 b/tests/btrfs/002 index 66775562..4de0a3d7 100755 --- a/tests/btrfs/002 +++ b/tests/btrfs/002 @@ -6,13 +6,9 @@ # # Extented btrfs snapshot test cases # -seq=`basename $0` -seqres=$RESULT_DIR/$seq -echo "QA output created by $seq" +. ./common/test_names +_set_seq_and_groups auto snapshot -here=`pwd` -tmp=/tmp/$$ -status=1 # failure is the default! _cleanup() { diff --git a/tests/btrfs/003 b/tests/btrfs/003 index fbb313fb..f1e06af5 100755 --- a/tests/btrfs/003 +++ b/tests/btrfs/003 @@ -6,13 +6,9 @@ # # btrfs vol tests # -seq=`basename $0` -seqres=$RESULT_DIR/$seq -echo "QA output created by $seq" +. ./common/test_names +_set_seq_and_groups auto replace volume balance -here=`pwd` -tmp=/tmp/$$ -status=1 # failure is the default! dev_removed=0 removed_dev_htl="" trap "_cleanup; exit \$status" 0 1 2 3 15 diff --git a/tests/btrfs/004 b/tests/btrfs/004 index 0458d2b6..d7071d80 100755 --- a/tests/btrfs/004 +++ b/tests/btrfs/004 @@ -9,13 +9,9 @@ # run filefrag to get the extent mapping and follow the backrefs. # We check to end up back at the original file with the correct offset. # -seq=`basename $0` -seqres=$RESULT_DIR/$seq -echo "QA output created by $seq" +. ./common/test_names +_set_seq_and_groups auto rw metadata -here=`pwd` -tmp=/tmp/$$ -status=1 noise_pid=0 _cleanup()