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.config | |
| 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.config')
| -rw-r--r-- | tests/qemu-iotests/common.config | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config index df082e750..08a3f100b 100644 --- a/tests/qemu-iotests/common.config +++ b/tests/qemu-iotests/common.config @@ -90,21 +90,23 @@ export PS_ALL_FLAGS="-ef" if [ -z "$QEMU_PROG" ]; then export QEMU_PROG="`set_prog_path qemu`" fi -[ "$QEMU_PROG" = "" ] && _fatal "qemu not found" if [ -z "$QEMU_IMG_PROG" ]; then export QEMU_IMG_PROG="`set_prog_path qemu-img`" fi -[ "$QEMU_IMG_PROG" = "" ] && _fatal "qemu-img not found" if [ -z "$QEMU_IO_PROG" ]; then export QEMU_IO_PROG="`set_prog_path qemu-io`" fi -[ "$QEMU_IO_PROG" = "" ] && _fatal "qemu-io not found" + +if [ -z "$QEMU_NBD_PROG" ]; then + export QEMU_NBD_PROG="`set_prog_path qemu-nbd`" +fi export QEMU=$QEMU_PROG -export QEMU_IMG=$QEMU_IMG_PROG +export QEMU_IMG=$QEMU_IMG_PROG export QEMU_IO="$QEMU_IO_PROG $QEMU_IO_OPTIONS" +export QEMU_NBD=$QEMU_NBD_PROG [ -f /etc/qemu-iotest.config ] && . /etc/qemu-iotest.config |