Re: [Qemu-devel] [PATCHv2 02/18] qemu-iotests: enable support for NFS protocol

[Jeff Cody]

On Sun, Jan 05, 2014 at 06:21:52PM +0100, Peter Lieven wrote:
> Signed-off-by: Peter Lieven <address@hidden>
> ---
>  tests/qemu-iotests/common    |   22 +++++++++++++++++++---
>  tests/qemu-iotests/common.rc |    3 +++
>  2 files changed, 22 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common
> index 8b4e22c..e19673b 100644
> --- a/tests/qemu-iotests/common
> +++ b/tests/qemu-iotests/common
> @@ -144,10 +144,12 @@ check options
>      -vpc                test vpc
>      -vhdx               test vhdx
>      -vmdk               test vmdk
> +    -file               test file (default)
>      -rbd                test rbd
>      -sheepdog           test sheepdog
>      -nbd                test nbd
>      -ssh                test ssh
> +    -nfs                test nfs
>      -xdiff              graphical mode diff
>      -nocache            use O_DIRECT on backing file
>      -misalign           misalign memory allocations
> @@ -211,22 +213,36 @@ testlist options
>              xpand=false
>              ;;
>  
> +        -file)
> +            IMGFMT=file

This should be IMGPROTO, right?

> +            xpand=false
> +            ;;
> +
>          -rbd)
>              IMGPROTO=rbd
>              xpand=false
>              ;;
> +
>          -sheepdog)
>              IMGPROTO=sheepdog
>              xpand=false
>              ;;
> +
>          -nbd)
>              IMGPROTO=nbd
>              xpand=false
>              ;;
> +
>          -ssh)
>              IMGPROTO=ssh
>              xpand=false
>              ;;
> +
> +        -nfs)
> +            IMGPROTO=nfs
> +            xpand=false
> +            ;;
> +
>          -nocache)
>              CACHEMODE="none"
>              CACHEMODE_IS_DEFAULT=false
> @@ -238,10 +254,10 @@ testlist options
>              xpand=false
>              ;;
>  
> -    -valgrind)
> -        valgrind=true
> +        -valgrind)
> +            valgrind=true
>              xpand=false
> -        ;;
> +            ;;
>  
>          -g)        # -g group ... pick from group file
>              group=true
> diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
> index 28ba0d9..940b863 100644
> --- a/tests/qemu-iotests/common.rc
> +++ b/tests/qemu-iotests/common.rc
> @@ -61,6 +61,9 @@ elif [ "$IMGPROTO" = "nbd" ]; then
>  elif [ "$IMGPROTO" = "ssh" ]; then
>      TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
>      TEST_IMG="ssh://127.0.0.1$TEST_IMG_FILE"
> +elif [ "$IMGPROTO" = "nfs" ]; then
> +    TEST_DIR="nfs://127.0.0.1/$TEST_DIR"
> +    TEST_IMG=$TEST_DIR/t.$IMGFMT
>  else
>      TEST_IMG=$IMGPROTO:$TEST_DIR/t.$IMGFMT
>  fi
> -- 
> 1.7.9.5
>