qemu-iotests: enable support for NFS protocol

Signed-off-by: Peter Lieven <pl@kamp.de>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Peter Lieven 2014-02-03 10:26:17 +01:00 committed by Kevin Wolf
parent a19737f1bd
commit 170632dbc9
2 changed files with 22 additions and 3 deletions

View file

@ -144,10 +144,12 @@ check options
-vpc test vpc -vpc test vpc
-vhdx test vhdx -vhdx test vhdx
-vmdk test vmdk -vmdk test vmdk
-file test file (default)
-rbd test rbd -rbd test rbd
-sheepdog test sheepdog -sheepdog test sheepdog
-nbd test nbd -nbd test nbd
-ssh test ssh -ssh test ssh
-nfs test nfs
-xdiff graphical mode diff -xdiff graphical mode diff
-nocache use O_DIRECT on backing file -nocache use O_DIRECT on backing file
-misalign misalign memory allocations -misalign misalign memory allocations
@ -211,22 +213,36 @@ testlist options
xpand=false xpand=false
;; ;;
-file)
IMGPROTO=file
xpand=false
;;
-rbd) -rbd)
IMGPROTO=rbd IMGPROTO=rbd
xpand=false xpand=false
;; ;;
-sheepdog) -sheepdog)
IMGPROTO=sheepdog IMGPROTO=sheepdog
xpand=false xpand=false
;; ;;
-nbd) -nbd)
IMGPROTO=nbd IMGPROTO=nbd
xpand=false xpand=false
;; ;;
-ssh) -ssh)
IMGPROTO=ssh IMGPROTO=ssh
xpand=false xpand=false
;; ;;
-nfs)
IMGPROTO=nfs
xpand=false
;;
-nocache) -nocache)
CACHEMODE="none" CACHEMODE="none"
CACHEMODE_IS_DEFAULT=false CACHEMODE_IS_DEFAULT=false
@ -238,10 +254,10 @@ testlist options
xpand=false xpand=false
;; ;;
-valgrind) -valgrind)
valgrind=true valgrind=true
xpand=false xpand=false
;; ;;
-g) # -g group ... pick from group file -g) # -g group ... pick from group file
group=true group=true

View file

@ -61,6 +61,9 @@ elif [ "$IMGPROTO" = "nbd" ]; then
elif [ "$IMGPROTO" = "ssh" ]; then elif [ "$IMGPROTO" = "ssh" ]; then
TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
TEST_IMG="ssh://127.0.0.1$TEST_IMG_FILE" 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 else
TEST_IMG=$IMGPROTO:$TEST_DIR/t.$IMGFMT TEST_IMG=$IMGPROTO:$TEST_DIR/t.$IMGFMT
fi fi