[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.1 14/24] iotests: Simplify qemu-iotests-quick.s
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL for-2.1 14/24] iotests: Simplify qemu-iotests-quick.sh |
Date: |
Tue, 1 Jul 2014 10:48:47 +0200 |
From: Max Reitz <address@hidden>
As of the "iotests: Allow out-of-tree run" series, the qemu-iotests may
(and should) be run directly in the build tree and will then guess the
binary paths themselves. Therefore, qemu-iotests-quick.sh does not need
to (and should not) enter the source path anymore; also, it does not
need to specify the binaries because "check" will guess them
automatically.
As a side-effect, tests using qemu may now be added to the quick group.
Signed-off-by: Max Reitz <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
tests/qemu-iotests-quick.sh | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh
index c449e8a..8a9a4c6 100755
--- a/tests/qemu-iotests-quick.sh
+++ b/tests/qemu-iotests-quick.sh
@@ -1,16 +1,6 @@
#!/bin/sh
-# We don't know which of the system emulator binaries there is (or if there is
-# any at all), so the 'quick' group doesn't contain any tests that require
-# running qemu proper. Assign a fake binary name so that qemu-iotests doesn't
-# complain about the missing binary.
-export QEMU_PROG="this_should_be_unused"
-
-export QEMU_IMG_PROG="$(pwd)/qemu-img"
-export QEMU_IO_PROG="$(pwd)/qemu-io"
-export QEMU_NBD_PROG="$(pwd)/qemu-nbd"
-
-cd $SRC_PATH/tests/qemu-iotests
+cd tests/qemu-iotests
ret=0
./check -T -nocache -qcow2 -g quick || ret=1
--
1.9.3
- [Qemu-devel] [PULL for-2.1 06/24] virtio-blk: use aliases instead of duplicate qdev properties, (continued)
- [Qemu-devel] [PULL for-2.1 06/24] virtio-blk: use aliases instead of duplicate qdev properties, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 07/24] virtio-blk: drop virtio_blk_set_conf(), Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 08/24] virtio: fix virtio-blk child refcount in transports, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 09/24] virtio-blk: move qdev properties into virtio-blk.c, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 10/24] virtio-blk: replace x-iothread with iothread link property, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 11/24] qdev: drop iothread property type, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 12/24] virtio-blk: remove need for explicit x-data-plane=on option, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 13/24] qemu-img create: add 'nocow' option, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 14/24] iotests: Simplify qemu-iotests-quick.sh,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL for-2.1 15/24] iotests: Add qemu tests to quick group, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 17/24] block: make 'top' argument to block-commit optional, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 16/24] iotests: Add more tests to quick group, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 18/24] block: simplify bdrv_find_base() and bdrv_find_overlay(), Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 19/24] block/cow: Avoid use of uninitialized cow_bs in error path, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 20/24] qapi: Change back sector-count to sectors-count in quorum QAPI events., Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 21/24] block: add QAPI command to allow live backing file change, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 23/24] block: extend block-commit to accept a string for the backing file, Stefan Hajnoczi, 2014/07/01