On Thu, Dec 16, 2021 at 07:47:52AM -0500, Jeff Layton wrote:
> Some tests on ceph require changing the layout of new files, which is
> forbidden when the files are encrypted. Skip these tests if the
> test_dummy_encryption mount option is being used.
>
> Generalize the _exclude_scratch_mount_option code and add a new
> _exclude_test_mount_option call as well. Call the new function from the
> ceph tests that should exclude test_dummy_encryption.
>
> Cc: Luis Henriques <lhenriques@xxxxxxx>
> Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx>
> ---
> common/rc | 18 ++++++++++++++----
> tests/ceph/001 | 1 +
> tests/ceph/002 | 1 +
> tests/ceph/003 | 1 +
> 4 files changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/common/rc b/common/rc
> index 7973ceb5fdf8..312ebea8fb57 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -3844,14 +3844,14 @@ _require_cloner()
> # "opt1 opt2 opt3"
> _normalize_mount_options()
> {
> - echo $MOUNT_OPTIONS | sed -n 's/-o\s*\(\S*\)/\1/gp'| sed 's/,/ /g'
> + echo "$1" | sed -n 's/-o\s*\(\S*\)/\1/gp'| sed 's/,/ /g'
> }
Doesn't this break the call to _normalize_mount_options() in common/btrfs?
>
> -# skip test if MOUNT_OPTIONS contains the given strings
> +# skip test if $2 contains the given strings in $1
> # Both dax and dax=always are excluded if dax or dax=always is passed
> -_exclude_scratch_mount_option()
> +_exclude_mount_option()
> {
> - local mnt_opts=$(_normalize_mount_options)
> + local mnt_opts=$(_normalize_mount_options "$2")
>
> while [ $# -gt 0 ]; do
> local pattern=$1
> @@ -3864,6 +3864,16 @@ _exclude_scratch_mount_option()
> done
> }
This function already uses all positional arguments, so using $2 isn't valid.
- Eric
