ceph/001-003: skip if test_dummy_encryption is enabled
authorJeff Layton <jlayton@kernel.org>
Thu, 6 Jan 2022 13:30:49 +0000 (08:30 -0500)
committerEryu Guan <guaneryu@gmail.com>
Sun, 9 Jan 2022 13:35:16 +0000 (21:35 +0800)
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@suse.de>
Cc: Eric Biggers <ebiggers@kernel.org>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
Reviewed-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Luis Henriques <lhenriques@suse.de>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
common/btrfs
common/rc
tests/ceph/001
tests/ceph/002
tests/ceph/003

index fe5985663ab456332b77ed9fa42c05832ac600eb..4afe81eb2dfbce23af97a2d1dad5b4cae45bd647 100644 (file)
@@ -115,7 +115,7 @@ _require_btrfs_fs_sysfs()
 
 _require_btrfs_no_compress()
 {
-       if _normalize_mount_options | grep -q "compress"; then
+       if _normalize_mount_options "$MOUNT_OPTIONS" | grep -q "compress"; then
                _notrun "This test requires no compression enabled"
        fi
 }
index 09a5c0661e30e2c6acf0156b6d942b1ff9be251f..c087875a4251ded87c2742d763231d3c8620ec49 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -2027,7 +2027,7 @@ _require_sane_bdev_flush()
 # Returns 0 if DAX will be used, 1 if DAX is not going to be used.
 __scratch_uses_fsdax()
 {
-       local ops=$(_normalize_mount_options)
+       local ops=$(_normalize_mount_options "$MOUNT_OPTIONS")
 
        echo $ops | egrep -qw "dax(=always| |$)" && return 0
        echo $ops | grep -qw "dax=never" && return 1
@@ -3706,7 +3706,7 @@ _has_metadata_journaling()
                        return 1
                }
                # ext4 might not load a journal
-               if _normalize_mount_options | grep -qw "noload"; then
+               if _normalize_mount_options "$MOUNT_OPTIONS" | grep -qw "noload"; then
                        echo "mount option \"noload\" not allowed in this test"
                        return 1
                fi
@@ -3870,20 +3870,20 @@ _require_cloner()
                _notrun "cloner binary not present at $CLONER_PROG"
 }
 
-# Normalize mount options from global $MOUNT_OPTIONS
-# Convert options like "-o opt1,opt2 -oopt3" to
-# "opt1 opt2 opt3"
+# Normalize mount options from the option string in $1
+# Convert options like "-o opt1,opt2 -oopt3" to "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'
 }
 
-# skip test if MOUNT_OPTIONS contains the given strings
+# skip test if $1 contains the given strings in trailing arguments
 # 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 "$1")
 
+       shift
        while [ $# -gt 0 ]; do
                local pattern=$1
                echo "$pattern" | egrep -q "dax(=always|$)" && \
@@ -3895,6 +3895,16 @@ _exclude_scratch_mount_option()
        done
 }
 
+_exclude_scratch_mount_option()
+{
+       _exclude_mount_option "$MOUNT_OPTIONS" $@
+}
+
+_exclude_test_mount_option()
+{
+       _exclude_mount_option "$TEST_FS_MOUNT_OPTS" $@
+}
+
 _require_atime()
 {
        _exclude_scratch_mount_option "noatime"
index c00de308fd9595248bd3f68d402c8fcbeafa3272..5a828567d50028f008a23c6d7704548b989de4f6 100755 (executable)
@@ -22,6 +22,7 @@ _begin_fstest auto quick copy_range
 _supported_fs ceph
 
 _require_xfs_io_command "copy_range"
+_exclude_test_mount_option "test_dummy_encryption"
 _require_attrs
 _require_test
 
index 9bc728fd2e18692ec55267144c31c0e82c171475..ac3d65b529bdee81f5cf71ab17165a2fb19c7b39 100755 (executable)
@@ -30,6 +30,7 @@ _begin_fstest auto quick copy_range
 _supported_fs ceph
 
 _require_xfs_io_command "copy_range"
+_exclude_test_mount_option "test_dummy_encryption"
 _require_attrs
 _require_test
 
index faedb48cfeeab861166fc0b84715fc39c0c5849e..2d6cb393b3f6dbe5eb13abde69e098d8a1912184 100755 (executable)
@@ -18,6 +18,7 @@ _begin_fstest auto quick copy_range
 _supported_fs ceph
 
 _require_xfs_io_command "copy_range"
+_exclude_test_mount_option "test_dummy_encryption"
 _require_attrs
 _require_test