From: Dave Chinner <dchinner@redhat.com>
Date: Fri, 20 May 2022 01:23:35 +0000 (+1000)
Subject: fstests: tests should not source common/rc directly
X-Git-Tag: v2022.05.22~10
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6a1c3ac03574737ede5b2d723ff13f08bd7f7af8;p=users%2Fhch%2Fxfstests-dev.git

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 <dchinner@redhat.com>
Acked-by: Christian Brauner (Microsoft) <brauner@kernel.org>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Zorro Lang <zlang@kernel.org>
---

diff --git a/tests/btrfs/243 b/tests/btrfs/243
index 750b4323a..09a63bcd2 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 dadc8492b..426aab1c4 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 bf6e3f6b4..187a25154 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 edf9b03e2..c48338d80 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 74e0f5892..556d24502 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 fa6edadc9..8484fa8d9 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 1d4eaa539..39af90a91 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 1c3cf6e3a..3c3c05b71 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 c32d42b95..a0094e487 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 f03295a5c..cef8d6e83 100755
--- a/tests/generic/690
+++ b/tests/generic/690
@@ -24,7 +24,6 @@ _cleanup()
 	rm -r -f $tmp.*
 }
 
-. ./common/rc
 . ./common/filter
 . ./common/dmflakey