aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrick J. Wong <djwong@kernel.org>2023-09-26 18:42:58 -0700
committerZorro Lang <zlang@kernel.org>2023-10-05 22:41:09 +0800
commit9b88ac7ee50801254d8f8aad902bf39e269e257e (patch)
treea6c3e95927341c93e53405d3e0ff14f9831e4995
parent4609e9481fe879f539e433b0710f53401d13d4ba (diff)
downloadxfstests-dev-9b88ac7ee50801254d8f8aad902bf39e269e257e.tar.gz
btrfs/300: check existence of unshare arguments
Make sure the installed unshare binary supports all the arguments that it wants to use. The unshare program on my system (Ubuntu 22.04) doesn't support --map-auto, so this test fails unnecessarily. Signed-off-by: "Darrick J. Wong" <djwong@kernel.org> Reviewed-by: Filipe Manana <fdmanana@suse.com> Signed-off-by: Zorro Lang <zlang@kernel.org>
-rw-r--r--common/rc2
-rwxr-xr-xtests/btrfs/3002
2 files changed, 2 insertions, 2 deletions
diff --git a/common/rc b/common/rc
index 95d397b050..84fad4b856 100644
--- a/common/rc
+++ b/common/rc
@@ -5288,7 +5288,7 @@ _soak_loop_running() {
_require_unshare() {
unshare -f -r -m -p -U $@ true &>/dev/null || \
- _notrun "unshare: command not found, should be in util-linux"
+ _notrun "unshare $*: command not found, should be in util-linux"
}
# Return a random file in a directory. A directory is *not* followed
diff --git a/tests/btrfs/300 b/tests/btrfs/300
index ff87ee7112..8a0eaecf87 100755
--- a/tests/btrfs/300
+++ b/tests/btrfs/300
@@ -20,7 +20,7 @@ _require_test
_require_user
_require_group
_require_unix_perm_checking
-_require_unshare
+_require_unshare --keep-caps --map-auto --map-root-user
test_dir="${TEST_DIR}/${seq}"
cleanup() {