diff options
| author | Luis Chamberlain <mcgrof@kernel.org> | 2021-11-05 08:59:47 -0700 |
|---|---|---|
| committer | Eryu Guan <guaneryu@gmail.com> | 2021-11-07 21:58:17 +0800 |
| commit | bae1d15f6421cbe99b3e2e134c39d50248e7c261 (patch) | |
| tree | a5a263e8cd8e3af281abf759335eb1418d8c93e4 | |
| parent | 86db85c33c69da782cb91cae315a61d81425cffe (diff) | |
| download | xfstests-dev-bae1d15f6421cbe99b3e2e134c39d50248e7c261.tar.gz | |
common/btrfs: source module file and remove duplicates
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>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
| -rw-r--r-- | common/btrfs | 2 | ||||
| -rwxr-xr-x | tests/btrfs/124 | 1 | ||||
| -rwxr-xr-x | tests/btrfs/125 | 1 | ||||
| -rwxr-xr-x | tests/btrfs/163 | 1 | ||||
| -rwxr-xr-x | tests/btrfs/164 | 3 | ||||
| -rwxr-xr-x | tests/btrfs/219 | 1 | ||||
| -rwxr-xr-x | tests/btrfs/225 | 1 | ||||
| -rwxr-xr-x | tests/btrfs/242 | 1 |
8 files changed, 2 insertions, 9 deletions
diff --git a/common/btrfs b/common/btrfs index 5d938c19b5..2eab4b2993 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 5c05ffae1b..8771a3c12f 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 e46b194d01..b6a28f5cf4 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 7655383114..1dc081f1d9 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 59a9c90ea7..3e69b35fb6 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 1cd5daae9a..528175b8a4 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 ce1818db77..408c03d207 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 e1c102aec1..6ce620810c 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 |