From 0ad1c034838d9c5fc0830a1d780d857c47305cec Mon Sep 17 00:00:00 2001 From: Amir Goldstein Date: Sat, 19 Dec 2020 12:47:27 +0200 Subject: [PATCH] overlay: run unionmount tests with custom overlay mount options Assign $OVERLAY_MOUNT_OPTIONS to UNIONMOUNT_MNTOPTIONS and require that unionmount supports UNIONMOUNT_MNTOPTIONS if OVERLAY_MOUNT_OPTIONS was provided. For example, when the mount option metacopy=on is set in $OVERLAY_MOUNT_OPTIONS, it enables the --meta test option and affects the test verifications after copy up. Signed-off-by: Amir Goldstein Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- common/overlay | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/common/overlay b/common/overlay index 5e6a7e0f..1ca37e29 100644 --- a/common/overlay +++ b/common/overlay @@ -376,6 +376,13 @@ _require_unionmount_testsuite() local usage=`UNIONMOUNT_BASEDIR=_ "$UNIONMOUNT_TESTSUITE/run" 2>&1` echo $usage | grep -wq "UNIONMOUNT_BASEDIR" || \ _notrun "newer version of unionmount testsuite required." + + [ -n "$OVERLAY_MOUNT_OPTIONS" ] || return + # If custom overlay mount options are used + # verify that UNIONMOUNT_MNTOPTIONS var is supported + local usage=`UNIONMOUNT_MNTOPTIONS=_ "$UNIONMOUNT_TESTSUITE/run" 2>&1` + echo $usage | grep -wq "UNIONMOUNT_MNTOPTIONS" || \ + _notrun "newer version of unionmount testsuite required to support OVERLAY_MOUNT_OPTIONS." } _unionmount_testsuite_run() @@ -394,6 +401,7 @@ _unionmount_testsuite_run() export UNIONMOUNT_LOWERDIR=$OVL_BASE_TEST_DIR/union fi export UNIONMOUNT_BASEDIR=$OVL_BASE_SCRATCH_MNT/union + export UNIONMOUNT_MNTOPTIONS="$OVERLAY_MOUNT_OPTIONS" _scratch_mkfs rm -rf $UNIONMOUNT_BASEDIR $UNIONMOUNT_LOWERDIR -- 2.39.5