diff options
| author | Anas Nashif <anas.nashif@intel.com> | 2013-01-15 13:31:42 -0800 |
|---|---|---|
| committer | Anas Nashif <anas.nashif@intel.com> | 2013-01-15 13:31:42 -0800 |
| commit | 42bf3037d458a330856a0be584200c1e41c3f417 (patch) | |
| tree | 25b9be1088727757e52271e25a446e8a852357df /tests/qemu-iotests/common | |
| parent | 060629c6ef0b7e5c267d84c91600113264d33120 (diff) | |
| download | qemu-42bf3037d458a330856a0be584200c1e41c3f417.tar.gz qemu-42bf3037d458a330856a0be584200c1e41c3f417.tar.bz2 qemu-42bf3037d458a330856a0be584200c1e41c3f417.zip | |
Imported Upstream version 1.3.0upstream/1.3.0
Diffstat (limited to 'tests/qemu-iotests/common')
| -rw-r--r-- | tests/qemu-iotests/common | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common index 1f6fdf5c5..b3aad89e2 100644 --- a/tests/qemu-iotests/common +++ b/tests/qemu-iotests/common @@ -136,6 +136,7 @@ check options -vmdk test vmdk -rbd test rbd -sheepdog test sheepdog + -nbd test nbd -xdiff graphical mode diff -nocache use O_DIRECT on backing file -misalign misalign memory allocations @@ -197,12 +198,14 @@ testlist options IMGPROTO=rbd xpand=false ;; - -sheepdog) IMGPROTO=sheepdog xpand=false ;; - + -nbd) + IMGPROTO=nbd + xpand=false + ;; -nocache) QEMU_IO_OPTIONS="$QEMU_IO_OPTIONS --nocache" xpand=false @@ -350,7 +353,11 @@ fi [ "$QEMU" = "" ] && _fatal "qemu not found" [ "$QEMU_IMG" = "" ] && _fatal "qemu-img not found" -[ "$QEMU_IO" = "" ] && _fatal "qemu-img not found" +[ "$QEMU_IO" = "" ] && _fatal "qemu-io not found" + +if [ "$IMGPROTO" = "nbd" ] ; then + [ "$QEMU_NBD" = "" ] && _fatal "qemu-nbd not found" +fi if $valgrind; then export REAL_QEMU_IO="$QEMU_IO_PROG" |