[PATCH] common/btrfs: source module file and remove duplicates

[PATCH] common/btrfs: source module file and remove duplicates

[Luis Chamberlain]

btrfs/249 fails with:

QA output created by 249
./common/btrfs: line 425: _require_loadable_fs_module: command not found
./common/btrfs: line 432: _reload_fs_module: command not found
ERROR: not a btrfs filesystem: /media/scratch

This is because the test is failing to source common/module.
Fix this by sourcing common/module in the btrfs common file.

While it it remove duplication of sourcing this file from other
tests in btrfs so that this is only done once in one place.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
 common/btrfs    | 2 ++
 tests/btrfs/124 | 1 -
 tests/btrfs/125 | 1 -
 tests/btrfs/163 | 1 -
 tests/btrfs/164 | 3 ---
 tests/btrfs/219 | 1 -
 tests/btrfs/225 | 1 -
 tests/btrfs/242 | 1 -
 8 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/common/btrfs b/common/btrfs
index 5d938c19..2eab4b29 100644
--- a/common/btrfs
+++ b/common/btrfs
@@ -2,6 +2,8 @@
 # Common btrfs specific functions
 #
 
+. common/module
+
 _btrfs_get_subvolid()
 {
 	mnt=$1
diff --git a/tests/btrfs/124 b/tests/btrfs/124
index 5c05ffae..8771a3c1 100755
--- a/tests/btrfs/124
+++ b/tests/btrfs/124
@@ -35,7 +35,6 @@ _cleanup()
 
 # Import common functions.
 . ./common/filter
-. ./common/module
 
 # real QA test starts here
 
diff --git a/tests/btrfs/125 b/tests/btrfs/125
index e46b194d..b6a28f5c 100755
--- a/tests/btrfs/125
+++ b/tests/btrfs/125
@@ -34,7 +34,6 @@ _cleanup()
 
 # Import common functions.
 . ./common/filter
-. ./common/module
 
 # real QA test starts here
 
diff --git a/tests/btrfs/163 b/tests/btrfs/163
index 76553831..1dc081f1 100755
--- a/tests/btrfs/163
+++ b/tests/btrfs/163
@@ -27,7 +27,6 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 . ./common/filter.btrfs
-. ./common/module
 
 # real QA test starts here
 
diff --git a/tests/btrfs/164 b/tests/btrfs/164
index 59a9c90e..3e69b35f 100755
--- a/tests/btrfs/164
+++ b/tests/btrfs/164
@@ -20,9 +20,6 @@ _cleanup()
 	_btrfs_rescan_devices
 }
 
-# Import common functions.
-. ./common/module
-
 # real QA test starts here
 
 # Modify as appropriate.
diff --git a/tests/btrfs/219 b/tests/btrfs/219
index 1cd5daae..528175b8 100755
--- a/tests/btrfs/219
+++ b/tests/btrfs/219
@@ -35,7 +35,6 @@ _cleanup()
 
 # Import common functions.
 . ./common/filter
-. ./common/module
 
 # real QA test starts here
 
diff --git a/tests/btrfs/225 b/tests/btrfs/225
index ce1818db..408c03d2 100755
--- a/tests/btrfs/225
+++ b/tests/btrfs/225
@@ -25,7 +25,6 @@ _cleanup()
 
 # Import common functions.
 . ./common/filter
-. ./common/module
 
 # real QA test starts here
 
diff --git a/tests/btrfs/242 b/tests/btrfs/242
index e1c102ae..6ce62081 100755
--- a/tests/btrfs/242
+++ b/tests/btrfs/242
@@ -13,7 +13,6 @@ _begin_fstest auto quick volume trim
 
 # Import common functions.
 . ./common/filter
-. ./common/module
 
 # real QA test starts here
 _supported_fs btrfs
-- 
2.33.0

Re: [PATCH] common/btrfs: source module file and remove duplicates

[Nikolay Borisov]

On 5.11.21 г. 17:59, Luis Chamberlain wrote:
> btrfs/249 fails with:
> 
> QA output created by 249
> ./common/btrfs: line 425: _require_loadable_fs_module: command not found
> ./common/btrfs: line 432: _reload_fs_module: command not found
> ERROR: not a btrfs filesystem: /media/scratch
> 
> This is because the test is failing to source common/module.
> Fix this by sourcing common/module in the btrfs common file.
> 
> While it it remove duplication of sourcing this file from other
> tests in btrfs so that this is only done once in one place.
> 
> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>

Reviewed-by: Nikolay Borisov <nborisov@suse.com>