[Qemu-devel] [PATCH 0/3] iotests: Fix qemu-iotests-quick.sh

[Qemu-devel] [PATCH 0/3] iotests: Fix qemu-iotests-quick.sh

[Max Reitz]

My previous series "iotests: Allow out-of-tree run" broke
qemu-iotests-quick.sh. Fixing it means simplifying it and allowing more
tests to be added to the quick group, which is what this series does. It
also adds some unaffected tests to the quick group because I can't see a
reason why not to.

This series (or at least patch 2) depends on v3 of my series
"block: Fix unset \"filename\" for certain drivers".


Max Reitz (3):
  iotests: Simplify qemu-iotests-quick.sh
  iotests: Add qemu tests to quick group
  iotests: Add more tests to quick group

 tests/qemu-iotests-quick.sh | 12 +---------
 tests/qemu-iotests/group    | 58 ++++++++++++++++++++++-----------------------
 2 files changed, 30 insertions(+), 40 deletions(-)

-- 
2.0.0

[Qemu-devel] [PATCH 1/3] iotests: Simplify qemu-iotests-quick.sh

[Max Reitz]

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 <mreitz@redhat.com>
---
 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
-- 
2.0.0

[Qemu-devel] [PATCH 2/3] iotests: Add qemu tests to quick group

[Max Reitz]

Now that qemu-iotests-quick.sh supports tests using the qemu binary, we
are free to add such tests to the quick group.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/group | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 0043f30..8bd488d 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -51,7 +51,7 @@
 042 rw auto quick
 043 rw auto backing
 044 rw auto
-045 rw auto
+045 rw auto quick
 046 rw auto aio
 047 rw auto
 048 img auto quick
@@ -71,13 +71,13 @@
 062 rw auto quick
 063 rw auto quick
 064 rw auto quick
-065 rw auto
+065 rw auto quick
 066 rw auto quick
-067 rw auto
-068 rw auto
+067 rw auto quick
+068 rw auto quick
 069 rw auto quick
 070 rw auto quick
-071 rw auto
+071 rw auto quick
 072 rw auto quick
 073 rw auto quick
 074 rw auto quick
@@ -87,17 +87,17 @@
 078 rw auto
 079 rw auto
 080 rw auto
-081 rw auto
+081 rw auto quick
 082 rw auto quick
 083 rw auto
 084 img auto
 085 rw auto
 086 rw auto quick
-087 rw auto
+087 rw auto quick
 088 rw auto
 089 rw auto quick
 090 rw auto quick
-091 rw auto
+091 rw auto quick
 092 rw auto quick
-095 rw auto
-097 rw auto
+095 rw auto quick
+097 rw auto quick
-- 
2.0.0

[Qemu-devel] [PATCH 3/3] iotests: Add more tests to quick group

[Max Reitz]

While at it, add some more tests to the quick group (those that run with
-nocache in under three seconds on my HDD).

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/group | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 8bd488d..957362b 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -7,16 +7,16 @@
 #
 # test-group association ... one line per test
 #
-001 rw auto
+001 rw auto quick
 002 rw auto quick
 003 rw auto
 004 rw auto quick
-005 img auto
+005 img auto quick
 006 img auto
 007 snapshot auto
-008 rw auto
-009 rw auto
-010 rw auto
+008 rw auto quick
+009 rw auto quick
+010 rw auto quick
 011 rw auto quick
 012 auto quick
 013 rw auto
@@ -24,36 +24,36 @@
 015 rw snapshot auto
 016 rw auto quick
 017 rw backing auto quick
-018 rw backing auto
+018 rw backing auto quick
 019 rw backing auto quick
 020 rw backing auto quick
-021 io auto
+021 io auto quick
 022 rw snapshot auto
 023 rw auto
 024 rw backing auto quick
 025 rw auto quick
 026 rw blkdbg auto
 027 rw auto quick
-028 rw backing auto
+028 rw backing auto quick
 029 rw auto quick
 030 rw auto backing
 031 rw auto quick
-032 rw auto
+032 rw auto quick
 033 rw auto quick
-034 rw auto backing
+034 rw auto backing quick
 035 rw auto quick
 036 rw auto quick
-037 rw auto backing
-038 rw auto backing
-039 rw auto
+037 rw auto backing quick
+038 rw auto backing quick
+039 rw auto quick
 040 rw auto
 041 rw auto backing
 042 rw auto quick
 043 rw auto backing
 044 rw auto
 045 rw auto quick
-046 rw auto aio
-047 rw auto
+046 rw auto aio quick
+047 rw auto quick
 048 img auto quick
 049 rw auto
 050 rw auto backing quick
@@ -81,20 +81,20 @@
 072 rw auto quick
 073 rw auto quick
 074 rw auto quick
-075 rw auto
+075 rw auto quick
 076 auto
 077 rw auto quick
-078 rw auto
+078 rw auto quick
 079 rw auto
 080 rw auto
 081 rw auto quick
 082 rw auto quick
 083 rw auto
-084 img auto
+084 img auto quick
 085 rw auto
 086 rw auto quick
 087 rw auto quick
-088 rw auto
+088 rw auto quick
 089 rw auto quick
 090 rw auto quick
 091 rw auto quick
-- 
2.0.0

Re: [Qemu-devel] [PATCH 0/3] iotests: Fix qemu-iotests-quick.sh

[Kevin Wolf]

Am 27.06.2014 um 22:47 hat Max Reitz geschrieben:
> My previous series "iotests: Allow out-of-tree run" broke
> qemu-iotests-quick.sh. Fixing it means simplifying it and allowing more
> tests to be added to the quick group, which is what this series does. It
> also adds some unaffected tests to the quick group because I can't see a
> reason why not to.
> 
> This series (or at least patch 2) depends on v3 of my series
> "block: Fix unset \"filename\" for certain drivers".

Reviewed-by: Kevin Wolf <kwolf@redhat.com>

The conflict without 'block: Fix unset "filename" for certain drivers'
is trivial to resolve (drop the 097 line in tests/qemu-iotests/group),
so this can be merged even without the other series.

Kevin

Re: [Qemu-devel] [PATCH 0/3] iotests: Fix qemu-iotests-quick.sh

[Stefan Hajnoczi]

[-- Attachment #1: Type: text/plain, Size: 966 bytes --]

On Fri, Jun 27, 2014 at 10:47:45PM +0200, Max Reitz wrote:
> My previous series "iotests: Allow out-of-tree run" broke
> qemu-iotests-quick.sh. Fixing it means simplifying it and allowing more
> tests to be added to the quick group, which is what this series does. It
> also adds some unaffected tests to the quick group because I can't see a
> reason why not to.
> 
> This series (or at least patch 2) depends on v3 of my series
> "block: Fix unset \"filename\" for certain drivers".
> 
> 
> Max Reitz (3):
>   iotests: Simplify qemu-iotests-quick.sh
>   iotests: Add qemu tests to quick group
>   iotests: Add more tests to quick group
> 
>  tests/qemu-iotests-quick.sh | 12 +---------
>  tests/qemu-iotests/group    | 58 ++++++++++++++++++++++-----------------------
>  2 files changed, 30 insertions(+), 40 deletions(-)
> 
> -- 
> 2.0.0
> 
> 

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan

[-- Attachment #2: Type: application/pgp-signature, Size: 473 bytes --]