generic/699 uses overalyfs helper _overlay_mount_dirs, which is meant to
be used by overlayfs tests, where MOUNT_OPTIONS refer to overalyfs mount
options.
Using this helper from a generic test when FSTYP is not overlay is
causing undesired results. For example, when MOUNT_OPTIONS is defined
and includes a mount option not supported by overalyfs (e.g. 'acl'),
the test is notrun because of:
mount: /vdc/ovl-merge: fsconfig() failed: overlay: Unknown parameter 'acl'.
There is no other generic test that includes the common/overlay helpers
and uses them, so remove this practice from generic/699 as well.
Signed-off-by: Amir Goldstein <amir73il@xxxxxxxxx>
---
tests/generic/699 | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/tests/generic/699 b/tests/generic/699
index 620a40aa..2a6f857d 100755
--- a/tests/generic/699
+++ b/tests/generic/699
@@ -8,7 +8,6 @@
# mounts specifically.
#
. ./common/preamble
-. ./common/overlay
_begin_fstest auto quick perms attr idmapped mount
# Override the default cleanup function.
@@ -96,20 +95,24 @@ reset_ownership()
stat -c '%u:%g' $path
}
+setup_overlayfs()
+{
+ mkdir -p $upper $work $merge
+ _mount -t overlay -o lowerdir=$lower,upperdir=$upper,workdir=$work \
+ overlay $merge $*
+}
+
# Prepare overlayfs with metacopy turned off.
setup_overlayfs_idmapped_lower_metacopy_off()
{
- mkdir -p $upper $work $merge
- _overlay_mount_dirs $lower $upper $work \
- overlay $merge -ometacopy=off || \
- _notrun "overlayfs doesn't support idmappped layers"
+ setup_overlayfs -ometacopy=off || \
+ _notrun "overlayfs doesn't support idmappped layers"
}
# Prepare overlayfs with metacopy turned on.
setup_overlayfs_idmapped_lower_metacopy_on()
{
- mkdir -p $upper $work $merge
- _overlay_mount_dirs $lower $upper $work overlay $merge -ometacopy=on
+ setup_overlayfs -ometacopy=on
}
reset_overlayfs()
--
2.34.1
