From 6a1c3ac03574737ede5b2d723ff13f08bd7f7af8 Mon Sep 17 00:00:00 2001 From: Dave Chinner Date: Fri, 20 May 2022 11:23:35 +1000 Subject: [PATCH] fstests: tests should not source common/rc directly _begin_fstest() does this as every test needs it, so remove it from all the tests that source it a second time. Signed-off-by: Dave Chinner Acked-by: Christian Brauner (Microsoft) Reviewed-by: Darrick J. Wong Signed-off-by: Zorro Lang --- tests/btrfs/243 | 1 - tests/btrfs/245 | 1 - tests/ext4/053 | 1 - tests/generic/644 | 1 - tests/generic/645 | 1 - tests/generic/647 | 1 - tests/generic/677 | 1 - tests/generic/678 | 1 - tests/generic/679 | 1 - tests/generic/690 | 1 - 10 files changed, 10 deletions(-) diff --git a/tests/btrfs/243 b/tests/btrfs/243 index 750b4323..09a63bcd 100755 --- a/tests/btrfs/243 +++ b/tests/btrfs/243 @@ -20,7 +20,6 @@ _cleanup() rm -r -f $tmp.* } -. ./common/rc . ./common/filter . ./common/dmflakey diff --git a/tests/btrfs/245 b/tests/btrfs/245 index dadc8492..426aab1c 100755 --- a/tests/btrfs/245 +++ b/tests/btrfs/245 @@ -11,7 +11,6 @@ _begin_fstest auto quick idmapped subvol # get standard environment, filters and checks -. ./common/rc . ./common/filter # real QA test starts here diff --git a/tests/ext4/053 b/tests/ext4/053 index bf6e3f6b..187a2515 100755 --- a/tests/ext4/053 +++ b/tests/ext4/053 @@ -28,7 +28,6 @@ _cleanup() } # get standard environment, filters and checks -. ./common/rc . ./common/filter . ./common/quota diff --git a/tests/generic/644 b/tests/generic/644 index edf9b03e..c48338d8 100755 --- a/tests/generic/644 +++ b/tests/generic/644 @@ -10,7 +10,6 @@ _begin_fstest auto quick cap idmapped mount # get standard environment, filters and checks -. ./common/rc . ./common/filter # real QA test starts here diff --git a/tests/generic/645 b/tests/generic/645 index 74e0f589..556d2450 100755 --- a/tests/generic/645 +++ b/tests/generic/645 @@ -10,7 +10,6 @@ _begin_fstest auto quick idmapped mount # get standard environment, filters and checks -. ./common/rc . ./common/filter # real QA test starts here diff --git a/tests/generic/647 b/tests/generic/647 index fa6edadc..8484fa8d 100755 --- a/tests/generic/647 +++ b/tests/generic/647 @@ -18,7 +18,6 @@ _cleanup() } # get standard environment, filters and checks -. ./common/rc . ./common/filter # real QA test starts here diff --git a/tests/generic/677 b/tests/generic/677 index 1d4eaa53..39af90a9 100755 --- a/tests/generic/677 +++ b/tests/generic/677 @@ -18,7 +18,6 @@ _cleanup() rm -r -f $tmp.* } -. ./common/rc . ./common/filter . ./common/dmflakey . ./common/punch diff --git a/tests/generic/678 b/tests/generic/678 index 1c3cf6e3..3c3c05b7 100755 --- a/tests/generic/678 +++ b/tests/generic/678 @@ -22,7 +22,6 @@ _cleanup() } # get standard environment, filters and checks -. ./common/rc . ./common/filter # real QA test starts here diff --git a/tests/generic/679 b/tests/generic/679 index c32d42b9..a0094e48 100755 --- a/tests/generic/679 +++ b/tests/generic/679 @@ -11,7 +11,6 @@ . ./common/preamble _begin_fstest auto quick prealloc -. ./common/rc . ./common/filter . ./common/punch diff --git a/tests/generic/690 b/tests/generic/690 index f03295a5..cef8d6e8 100755 --- a/tests/generic/690 +++ b/tests/generic/690 @@ -24,7 +24,6 @@ _cleanup() rm -r -f $tmp.* } -. ./common/rc . ./common/filter . ./common/dmflakey -- 2.39.5