With btrfs adding fscrypt support we're limiting the usage to plain v2
policies only. This means we need to update the _require's for
generic/593 that tests both v1 and v2 policies. The other sort of tests
will be split into two tests in later patches.
Signed-off-by: Josef Bacik <jo...@toxicpanda.com>
---
common/encrypt | 2 ++
tests/generic/593 | 1 +
2 files changed, 3 insertions(+)
diff --git a/common/encrypt b/common/encrypt
index 1372af66..120ca612 100644
--- a/common/encrypt
+++ b/common/encrypt
@@ -59,6 +59,8 @@ _require_scratch_encryption()
# policy required by the test.
if [ $# -ne 0 ]; then
_require_encryption_policy_support $SCRATCH_MNT "$@"
+ else
+ _require_encryption_policy_support $SCRATCH_MNT -v 1
fi
_scratch_unmount
diff --git a/tests/generic/593 b/tests/generic/593
index 2dda5d76..7907236c 100755
--- a/tests/generic/593
+++ b/tests/generic/593
@@ -17,6 +17,7 @@ _begin_fstest auto quick encrypt
# real QA test starts here
_supported_fs generic
+_require_scratch_encryption -v 1
_require_scratch_encryption -v 2
_require_command "$KEYCTL_PROG" keyctl
--
2.41.0
