On Thu, 2013-07-11 at 12:38 +0200, Lukas Czerner wrote:
> When MOUNT_OPTIONS change we should remount TEST_DEV to put the changes
> in effect. This will allow us to have different MOUNT_OPTIONS in sections
> in configuration file.
>
> Signed-off-by: Lukas Czerner <lczerner@xxxxxxxxxx>
Reviewed-by: Chandra Seetharaman <sekharan@xxxxxxxxxx>
> ---
> README.config-sections | 8 ++++++++
> check | 8 ++++++++
> 2 files changed, 16 insertions(+)
>
> diff --git a/README.config-sections b/README.config-sections
> index 4d60272..2849fd5 100644
> --- a/README.config-sections
> +++ b/README.config-sections
> @@ -36,6 +36,14 @@ For every section xfstests will run with specified options
> and will produce
> separate results in the '$RESULT_BASE/$section_name' directory.
>
>
> +Different mount options
> +-----------------------
> +
> +Specifying different mount options in difference config sections is allowed.
> +When MOUNT_OPTIONS differs in the following section TEST_DEV will be
> remounted
> +with new MOUNT_OPTIONS automatically before running the test.
> +
> +
> Multiple file systems
> ---------------------
>
> diff --git a/check b/check
> index 5775276..ef91260 100755
> --- a/check
> +++ b/check
> @@ -394,6 +394,7 @@ fi
>
> for section in $HOST_OPTIONS_SECTIONS; do
> OLD_FSTYP=$FSTYP
> + OLD_MOUNT_OPTIONS=$MOUNT_OPTIONS
> get_next_config $section
>
> mkdir -p $RESULT_BASE
> @@ -422,6 +423,13 @@ for section in $HOST_OPTIONS_SECTIONS; do
> exit 1
> fi
> _prepare_test_list
> + elif [ "$OLD_MOUNT_OPTIONS" != "$MOUNT_OPTIONS" ]; then
> + _umount_or_remount_ro $TEST_DEV 2>&1> /dev/null
> + out=`_mount_or_remount_rw "$MOUNT_OPTIONS" $TEST_DEV $TEST_DIR`
> + if [ $? -ne 1 ]; then
> + echo $out
> + exit 1
> + fi
> fi
>
> init_rc
|