On Wed, Jan 10, 2018 at 07:08:59PM -0800, Richard Wareing wrote:
> Some tests do not play well with realtime devices, in an effort to
> produce a stable set of test which exercise the realtime code paths
> we introduce a _require_no_realtime function to allow tests to opt
> out of realtime subvolume test runs.
>
> Signed-off-by: Richard Wareing <rwareing@xxxxxx>
> ---
> Changes since v2:
> * Fixed tests generic/409-411, _get_mount now honors $SCRATCH_OPTIONS
> * tests/xfs/202 reverted, the test does indeed work with larger test
> device
> * Added comments explaining why _require_no_realtime was declared
>
> Changes since v1:
> * None
>
> common/rc | 18 ++++++++++++++++--
> tests/xfs/077 | 2 ++
> tests/xfs/189 | 1 +
> tests/xfs/284 | 2 ++
> 4 files changed, 21 insertions(+), 2 deletions(-)
>
> diff --git a/common/rc b/common/rc
> index 9216efd..f5fe739 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -198,8 +198,14 @@ _mount()
> _get_mount()
> {
> local mnt_point=${!#}
> + local mnt_dev=${@:(-2):1}
> + local scratch_opts=""
tab/space indentation problem?
> + if [ "$mnt_dev" == "$SCRATCH_DEV" ]; then
"=" for comparison, not "==" (it's bashism, though we probably don't care...?)
> + _scratch_options mount
> + scratch_opts="$SCRATCH_OPTIONS"
> + fi
>
> - _mount $*
> + _mount $scratch_opts $*
> if [ $? -eq 0 ]; then
> MOUNTED_POINT_STACK="$mnt_point $MOUNTED_POINT_STACK"
> else
> @@ -230,7 +236,7 @@ _clear_mount_stack()
>
> _scratch_options()
> {
> - type=$1
> + local type=$1
> SCRATCH_OPTIONS=""
>
> if [ "$FSTYP" != "xfs" ]; then
> @@ -1737,6 +1743,14 @@ _require_realtime()
> _notrun "Realtime device required, skipped this test"
> }
>
> +# This test requires that a realtime subvolume is not in use
> +#
> +_require_no_realtime()
> +{
> + [ -n "$SCRATCH_RTDEV" ] && \
> + _notrun "Test not compatible with realtime subvolumes, skipped this test"
Do we have to check USE_EXTERNAL = yes here too?
> +}
> +
> # this test requires that a specified command (executable) exists
> # $1 - command, $2 - name for error message
> #
> diff --git a/tests/xfs/077 b/tests/xfs/077
> index eba4f08..6d5ac1a 100755
> --- a/tests/xfs/077
> +++ b/tests/xfs/077
> @@ -50,6 +50,8 @@ _cleanup()
>
> _supported_fs xfs
> _supported_os Linux
> +# xfs_copy does not support realtime devices
This seems like more of a bug in xfs_copy to me... :)
--D
> +_require_no_realtime
> _require_scratch
> _require_xfs_crc
> _require_meta_uuid
> diff --git a/tests/xfs/189 b/tests/xfs/189
> index 636f6f0..699eb3c 100755
> --- a/tests/xfs/189
> +++ b/tests/xfs/189
> @@ -236,6 +236,7 @@ _putback_scratch_fstab()
> _supported_fs xfs
> _supported_os Linux
>
> +_require_no_realtime
> _require_scratch
> _require_noattr2
>
> diff --git a/tests/xfs/284 b/tests/xfs/284
> index e3625fe..d0eb5bd 100755
> --- a/tests/xfs/284
> +++ b/tests/xfs/284
> @@ -49,6 +49,8 @@ rm -f $seqres.full
> # real QA test starts here
> _supported_fs xfs
> _supported_os Linux
> +# xfs_copy does not support realtime devices
> +_require_no_realtime
> _require_test
> _require_scratch
>
> --
> 2.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
