[Qemu-devel] [PATCH 0/2] Enable iotests during "make check"

[Qemu-devel] [PATCH 0/2] Enable iotests during "make check"

[Thomas Huth]

First patch removes some more problematic tests from the "auto" group,
so that we can finally enable the "iotests" during "make check" in the
second patch.

Thomas Huth (2):
  tests/qemu-iotests/group: Remove some more tests from the "auto" group
  tests: Run the iotests during "make check" again

 tests/Makefile.include      |   8 +--
 tests/check-block.sh        |  44 +++++++++++----
 tests/qemu-iotests-quick.sh |   8 ---
 tests/qemu-iotests/group    | 109 ++++++++++++++++++------------------
 4 files changed, 93 insertions(+), 76 deletions(-)
 delete mode 100755 tests/qemu-iotests-quick.sh

-- 
2.21.0

[Qemu-devel] [PATCH 1/2] tests/qemu-iotests/group: Remove some more tests from the "auto" group

[Thomas Huth]

Remove some more tests from the "auto" group that either have issues
in certain environments (like macOS or FreeBSD, or on certain file systems
like ZFS or tmpfs), do not work with the qcow2 format, or that are simply
taking too much time.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/qemu-iotests/group | 109 ++++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 54 deletions(-)

diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index b34c8e3c0c..9db19f7bed 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -14,7 +14,8 @@
 #   runnable in any case. That means they should run with every QEMU binary
 #   (also non-x86), with every QEMU configuration (i.e. must not fail if
 #   an optional feature is not compiled in - but reporting a "skip" is ok),
-#   and work all kind of host filesystems and users (e.g. "nobody" or "root").
+#   work at least with the qcow2 file format and work all kind of host
+#   filesystems and users (e.g. "nobody" or "root").
 #
 
 #
@@ -33,8 +34,8 @@
 011 rw auto quick
 012 auto quick
 013 rw auto
-014 rw auto
-015 rw snapshot auto
+014 rw
+015 rw snapshot
 # 016 was removed, do not reuse
 017 rw backing auto quick
 018 rw backing auto quick
@@ -42,7 +43,7 @@
 020 rw backing auto quick
 021 io auto quick
 022 rw snapshot auto
-023 rw auto
+023 rw
 024 rw backing auto quick
 025 rw auto quick
 026 rw blkdbg
@@ -78,94 +79,94 @@
 056 rw backing
 057 rw
 058 rw quick
-059 rw auto quick
+059 rw quick
 060 rw auto quick
 061 rw auto
 062 rw auto quick
 063 rw auto quick
-064 rw auto quick
+064 rw quick
 065 rw quick
 066 rw auto quick
 067 rw quick
 068 rw quick
 069 rw auto quick
-070 rw auto quick
+070 rw quick
 071 rw auto quick
 072 rw auto quick
 073 rw auto quick
 074 rw auto quick
-075 rw auto quick
-076 auto
-077 rw auto quick
-078 rw auto quick
+075 rw quick
+076 io
+077 rw quick
+078 rw quick
 079 rw auto
 080 rw auto
-081 rw auto quick
-082 rw auto quick
-083 rw auto
-084 img auto quick
+081 rw quick
+082 rw quick
+083 rw
+084 img quick
 085 rw
 086 rw auto quick
 087 rw quick
-088 rw auto quick
+088 rw quick
 089 rw auto quick
 090 rw auto quick
-091 rw auto migration
-092 rw auto quick
+091 rw migration
+092 rw quick
 093 throttle
-094 rw auto quick
+094 rw quick
 095 rw quick
 096 rw quick
 097 rw auto backing
 098 rw auto backing quick
 099 rw auto quick
 # 100 was removed, do not reuse
-101 rw auto quick
-102 rw auto quick
+101 rw quick
+102 rw quick
 103 rw auto quick
 104 rw auto
 105 rw auto quick
-106 rw auto quick
+106 rw quick
 107 rw auto quick
 108 rw auto quick
-109 rw auto
+109 rw
 110 rw auto backing quick
 111 rw auto quick
 112 rw
-113 rw auto quick
+113 rw quick
 114 rw auto quick
 115 rw
-116 rw auto quick
+116 rw quick
 117 rw auto
 118 rw
-119 rw auto quick
+119 rw quick
 120 rw auto quick
 121 rw
 122 rw auto
-123 rw auto quick
+123 rw quick
 124 rw backing
 125 rw
 126 rw auto backing
 127 rw backing quick
-128 rw auto quick
+128 rw quick
 129 rw quick
 130 rw auto quick
-131 rw auto quick
+131 rw quick
 132 rw quick
 133 auto quick
 134 rw auto quick
-135 rw auto
+135 rw
 136 rw
 137 rw auto
 138 rw auto quick
 139 rw quick
 140 rw auto quick
 141 rw auto quick
-142 auto
+142 o_direct
 143 auto quick
 144 rw quick
 145 quick
-146 auto quick
+146 quick
 147 img
 148 rw quick
 149 rw sudo
@@ -179,18 +180,18 @@
 157 quick
 158 rw auto quick
 159 rw auto quick
-160 rw auto quick
+160 rw quick
 161 rw auto quick
 162 quick
 163 rw
 165 rw quick
 169 rw quick migration
 170 rw auto quick
-171 rw auto quick
+171 rw quick
 172 auto
-173 rw auto
+173 rw
 174 auto
-175 auto quick
+175 quick
 176 rw auto backing
 177 rw auto quick
 178 img
@@ -220,13 +221,13 @@
 204 rw quick
 205 rw quick
 206 rw
-207 rw auto
+207 rw
 208 rw quick
 209 rw quick
-210 rw auto
-211 rw auto quick
-212 rw auto quick
-213 rw auto quick
+210 rw
+211 rw quick
+212 rw quick
+213 rw quick
 214 rw auto
 215 rw auto quick
 216 rw quick
@@ -234,38 +235,38 @@
 218 rw quick
 219 rw
 220 rw auto
-221 rw auto quick
+221 rw quick
 222 rw quick
 223 rw quick
 224 rw quick
-225 rw auto quick
+225 rw quick
 226 auto quick
 227 quick
 228 rw quick
 229 auto quick
-231 auto quick
+231 quick
 232 quick
-233 auto quick
+233 quick
 234 quick migration
 235 quick
 236 quick
-237 rw auto quick
+237 rw quick
 238 quick
-239 rw auto quick
+239 rw quick
 240 quick
-241 rw auto quick
+241 rw quick
 242 rw quick
-243 rw auto quick
+243 rw quick
 244 rw auto quick
 245 rw
 246 rw quick
 247 rw quick
 248 rw quick
 249 rw auto quick
-250 rw auto quick
+250 rw quick
 251 rw auto quick
 252 rw auto backing quick
-253 rw auto quick
-254 rw auto backing quick
-255 rw auto quick
-256 rw auto quick
+253 rw o_direct quick
+254 rw backing quick
+255 rw quick
+256 rw quick
-- 
2.21.0

Re: [Qemu-devel] [PATCH 1/2] tests/qemu-iotests/group: Remove some more tests from the "auto" group

[Eric Blake]

[-- Attachment #1.1: Type: text/plain, Size: 940 bytes --]

On 7/15/19 9:54 AM, Thomas Huth wrote:
> Remove some more tests from the "auto" group that either have issues
> in certain environments (like macOS or FreeBSD, or on certain file systems
> like ZFS or tmpfs), do not work with the qcow2 format, or that are simply
> taking too much time.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  tests/qemu-iotests/group | 109 ++++++++++++++++++++-------------------
>  1 file changed, 55 insertions(+), 54 deletions(-)

>  251 rw auto quick
>  252 rw auto backing quick
> -253 rw auto quick
> -254 rw auto backing quick
> -255 rw auto quick
> -256 rw auto quick
> +253 rw o_direct quick

Where is the new 'o_direct' group documented?  Is this a typo for
something else?

> +254 rw backing quick
> +255 rw quick
> +256 rw quick
> 

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [Qemu-devel] [PATCH 1/2] tests/qemu-iotests/group: Remove some more tests from the "auto" group

[Thomas Huth]

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

On 15/07/2019 17.12, Eric Blake wrote:
> On 7/15/19 9:54 AM, Thomas Huth wrote:
>> Remove some more tests from the "auto" group that either have issues
>> in certain environments (like macOS or FreeBSD, or on certain file systems
>> like ZFS or tmpfs), do not work with the qcow2 format, or that are simply
>> taking too much time.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>  tests/qemu-iotests/group | 109 ++++++++++++++++++++-------------------
>>  1 file changed, 55 insertions(+), 54 deletions(-)
> 
>>  251 rw auto quick
>>  252 rw auto backing quick
>> -253 rw auto quick
>> -254 rw auto backing quick
>> -255 rw auto quick
>> -256 rw auto quick
>> +253 rw o_direct quick
> 
> Where is the new 'o_direct' group documented?  Is this a typo for
> something else?

I needed a new group for test 142 since it would be without any group at
all otherwise:

-142 auto
+142 o_direct

Tests without a group are currently only possible if the line ends with
a space - which is quite error prone. So I think it's better to use a
new group here. Since 253 is about testing with O_DIRECT, too, I've put
it into this group, too. Sorry, I should have mentioned it in the patch
description.

 Thomas


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [Qemu-devel] [PATCH 1/2] tests/qemu-iotests/group: Remove some more tests from the "auto" group

[Max Reitz]

[-- Attachment #1.1: Type: text/plain, Size: 2354 bytes --]

On 15.07.19 17:18, Thomas Huth wrote:
> On 15/07/2019 17.12, Eric Blake wrote:
>> On 7/15/19 9:54 AM, Thomas Huth wrote:
>>> Remove some more tests from the "auto" group that either have issues
>>> in certain environments (like macOS or FreeBSD, or on certain file systems
>>> like ZFS or tmpfs), do not work with the qcow2 format, or that are simply
>>> taking too much time.
>>>
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>>  tests/qemu-iotests/group | 109 ++++++++++++++++++++-------------------
>>>  1 file changed, 55 insertions(+), 54 deletions(-)
>>
>>>  251 rw auto quick
>>>  252 rw auto backing quick
>>> -253 rw auto quick
>>> -254 rw auto backing quick
>>> -255 rw auto quick
>>> -256 rw auto quick
>>> +253 rw o_direct quick
>>
>> Where is the new 'o_direct' group documented?  Is this a typo for
>> something else?
> 
> I needed a new group for test 142 since it would be without any group at
> all otherwise:
> 
> -142 auto
> +142 o_direct
> 
> Tests without a group are currently only possible if the line ends with
> a space - which is quite error prone.

Why not just fix that, then?

> diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
> index f925606cc5..c24874ff4a 100755
> --- a/tests/qemu-iotests/check
> +++ b/tests/qemu-iotests/check
> @@ -488,7 +488,7 @@ testlist options
>  BEGIN        { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \
>          | while read id
>          do
> -            if grep -s "^$id " "$source_iotests/group" >/dev/null
> +            if grep -s "^$id\( \|\$\)" "$source_iotests/group" >/dev/null
>              then
>                  # in group file ... OK
>                  echo $id >>$tmp.list
> @@ -547,7 +547,7 @@ else
>          touch $tmp.list
>      else
>          # no test numbers, do everything from group file
> -        sed -n -e '/^[0-9][0-9][0-9]*/s/[         ].*//p' <"$source_iotests/group" >$tmp.list
> +        sed -n -e '/^[0-9][0-9][0-9]*/s/^\([0-9]*\).*/\1/p' <"$source_iotests/group" >$tmp.list
>      fi
>  fi
>  

looks to be enough for me.

Max

> So I think it's better to use a
> new group here. Since 253 is about testing with O_DIRECT, too, I've put
> it into this group, too. Sorry, I should have mentioned it in the patch
> description.
> 
>  Thomas
> 



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [Qemu-devel] [PATCH 1/2] tests/qemu-iotests/group: Remove some more tests from the "auto" group

[Thomas Huth]

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

On 15/07/2019 19.17, Max Reitz wrote:
> On 15.07.19 17:18, Thomas Huth wrote:
>> On 15/07/2019 17.12, Eric Blake wrote:
>>> On 7/15/19 9:54 AM, Thomas Huth wrote:
>>>> Remove some more tests from the "auto" group that either have issues
>>>> in certain environments (like macOS or FreeBSD, or on certain file systems
>>>> like ZFS or tmpfs), do not work with the qcow2 format, or that are simply
>>>> taking too much time.
>>>>
>>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>>> ---
>>>>  tests/qemu-iotests/group | 109 ++++++++++++++++++++-------------------
>>>>  1 file changed, 55 insertions(+), 54 deletions(-)
>>>
>>>>  251 rw auto quick
>>>>  252 rw auto backing quick
>>>> -253 rw auto quick
>>>> -254 rw auto backing quick
>>>> -255 rw auto quick
>>>> -256 rw auto quick
>>>> +253 rw o_direct quick
>>>
>>> Where is the new 'o_direct' group documented?  Is this a typo for
>>> something else?
>>
>> I needed a new group for test 142 since it would be without any group at
>> all otherwise:
>>
>> -142 auto
>> +142 o_direct
>>
>> Tests without a group are currently only possible if the line ends with
>> a space - which is quite error prone.
> 
> Why not just fix that, then?

That's of course the even better solution :-)

>> diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
>> index f925606cc5..c24874ff4a 100755
>> --- a/tests/qemu-iotests/check
>> +++ b/tests/qemu-iotests/check
>> @@ -488,7 +488,7 @@ testlist options
>>  BEGIN        { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \
>>          | while read id
>>          do
>> -            if grep -s "^$id " "$source_iotests/group" >/dev/null
>> +            if grep -s "^$id\( \|\$\)" "$source_iotests/group" >/dev/null
>>              then
>>                  # in group file ... OK
>>                  echo $id >>$tmp.list
>> @@ -547,7 +547,7 @@ else
>>          touch $tmp.list
>>      else
>>          # no test numbers, do everything from group file
>> -        sed -n -e '/^[0-9][0-9][0-9]*/s/[         ].*//p' <"$source_iotests/group" >$tmp.list

That old "[       ]" looks quite strange anyway! I guess there was a TAB
in here originally which got replaced by spaces at one point in time?

>> +        sed -n -e '/^[0-9][0-9][0-9]*/s/^\([0-9]*\).*/\1/p' <"$source_iotests/group" >$tmp.list
>>      fi
>>  fi
>>  
> 
> looks to be enough for me.

Seems to work, thanks! I'll respin my series with your patch included.

 Thomas


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [Qemu-devel] [PATCH 1/2] tests/qemu-iotests/group: Remove some more tests from the "auto" group

[Max Reitz]

[-- Attachment #1.1: Type: text/plain, Size: 2658 bytes --]

On 16.07.19 11:03, Thomas Huth wrote:
> On 15/07/2019 19.17, Max Reitz wrote:
>> On 15.07.19 17:18, Thomas Huth wrote:
>>> On 15/07/2019 17.12, Eric Blake wrote:
>>>> On 7/15/19 9:54 AM, Thomas Huth wrote:
>>>>> Remove some more tests from the "auto" group that either have issues
>>>>> in certain environments (like macOS or FreeBSD, or on certain file systems
>>>>> like ZFS or tmpfs), do not work with the qcow2 format, or that are simply
>>>>> taking too much time.
>>>>>
>>>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>>>> ---
>>>>>  tests/qemu-iotests/group | 109 ++++++++++++++++++++-------------------
>>>>>  1 file changed, 55 insertions(+), 54 deletions(-)
>>>>
>>>>>  251 rw auto quick
>>>>>  252 rw auto backing quick
>>>>> -253 rw auto quick
>>>>> -254 rw auto backing quick
>>>>> -255 rw auto quick
>>>>> -256 rw auto quick
>>>>> +253 rw o_direct quick
>>>>
>>>> Where is the new 'o_direct' group documented?  Is this a typo for
>>>> something else?
>>>
>>> I needed a new group for test 142 since it would be without any group at
>>> all otherwise:
>>>
>>> -142 auto
>>> +142 o_direct
>>>
>>> Tests without a group are currently only possible if the line ends with
>>> a space - which is quite error prone.
>>
>> Why not just fix that, then?
> 
> That's of course the even better solution :-)
> 
>>> diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
>>> index f925606cc5..c24874ff4a 100755
>>> --- a/tests/qemu-iotests/check
>>> +++ b/tests/qemu-iotests/check
>>> @@ -488,7 +488,7 @@ testlist options
>>>  BEGIN        { for (t='$start'; t<='$end'; t++) printf "%03d\n",t }' \
>>>          | while read id
>>>          do
>>> -            if grep -s "^$id " "$source_iotests/group" >/dev/null
>>> +            if grep -s "^$id\( \|\$\)" "$source_iotests/group" >/dev/null
>>>              then
>>>                  # in group file ... OK
>>>                  echo $id >>$tmp.list
>>> @@ -547,7 +547,7 @@ else
>>>          touch $tmp.list
>>>      else
>>>          # no test numbers, do everything from group file
>>> -        sed -n -e '/^[0-9][0-9][0-9]*/s/[         ].*//p' <"$source_iotests/group" >$tmp.list
> 
> That old "[       ]" looks quite strange anyway! I guess there was a TAB
> in here originally which got replaced by spaces at one point in time?

That’s what I think, too.

>>> +        sed -n -e '/^[0-9][0-9][0-9]*/s/^\([0-9]*\).*/\1/p' <"$source_iotests/group" >$tmp.list
>>>      fi
>>>  fi
>>>  
>>
>> looks to be enough for me.
> 
> Seems to work, thanks! I'll respin my series with your patch included.

Great :-)

Max


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[Qemu-devel] [PATCH 2/2] tests: Run the iotests during "make check" again

[Thomas Huth]

People often forget to run the iotests before submitting patches or pull
requests - this is likely due to the fact that we do not run the tests
during our mandatory "make check" tests yet. Now that we've got a proper
"auto" group of iotests that should be fine to run in every environment,
we can enable the iotests during "make check" again by running the "auto"
tests by default from the check-block.sh script.

Some cases still need to be checked first, though: iotests need bash and
GNU sed (otherwise they fail), and if gprof is enabled, it spoils the
output of some test cases causing them to fail. So if we detect that one
of the required programs is missing or that gprof is enabled, we still
have to skip the iotests to avoid failures.

And finally, since we are using check-block.sh now again, this patch also
removes the qemu-iotests-quick.sh script since we do not need that anymore
(and having two shell wrapper scripts around the block tests seems rather
confusing than helpful).

Signed-off-by: Thomas Huth <thuth@redhat.com>
[AJB: -makecheck to check-block.sh, move check-block to start and gate it]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/Makefile.include      |  8 +++----
 tests/check-block.sh        | 44 ++++++++++++++++++++++++++++---------
 tests/qemu-iotests-quick.sh |  8 -------
 3 files changed, 38 insertions(+), 22 deletions(-)
 delete mode 100755 tests/qemu-iotests-quick.sh

diff --git a/tests/Makefile.include b/tests/Makefile.include
index a983dd32da..2bdc6e5d1c 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -141,7 +141,7 @@ check-unit-y += tests/test-uuid$(EXESUF)
 check-unit-y += tests/ptimer-test$(EXESUF)
 check-unit-y += tests/test-qapi-util$(EXESUF)
 
-check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh
+check-block-$(call land,$(CONFIG_POSIX),$(CONFIG_SOFTMMU)) += tests/check-block.sh
 
 # All QTests for now are POSIX-only, but the dependencies are
 # really in libqtest, not in the testcases themselves.
@@ -1090,8 +1090,8 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES)
 
 QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = tests/qemu-iotests/socket_scm_helper$(EXESUF)
 
-.PHONY: check-tests/qemu-iotests-quick.sh
-check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y)
+.PHONY: check-tests/check-block.sh
+check-tests/check-block.sh: tests/check-block.sh qemu-img$(EXESUF) qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y)
 	$<
 
 .PHONY: $(patsubst %, check-%, $(check-qapi-schema-y))
@@ -1165,7 +1165,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR)
 check-qapi-schema: $(patsubst %,check-%, $(check-qapi-schema-y)) check-tests/qapi-schema/doc-good.texi
 check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
 check-block: $(patsubst %,check-%, $(check-block-y))
-check: check-qapi-schema check-unit check-softfloat check-qtest check-decodetree
+check: check-block check-qapi-schema check-unit check-softfloat check-qtest check-decodetree
 check-clean:
 	rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)
 	rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) $(check-qtest-generic-y))
diff --git a/tests/check-block.sh b/tests/check-block.sh
index f3d12fd602..c8b6cec3f6 100755
--- a/tests/check-block.sh
+++ b/tests/check-block.sh
@@ -1,24 +1,48 @@
 #!/bin/sh
 
-FORMAT_LIST="raw qcow2 qed vmdk vpc"
+# Honor the SPEED environment variable, just like we do it for the qtests.
+if [ "$SPEED" = "slow" ]; then
+    format_list="raw qcow2"
+    group=
+elif [ "$SPEED" = "thorough" ]; then
+    format_list="raw qcow2 qed vmdk vpc"
+    group=
+else
+    format_list=qcow2
+    group="-g auto"
+fi
+
 if [ "$#" -ne 0 ]; then
-    FORMAT_LIST="$@"
+    format_list="$@"
+fi
+
+if grep -q "TARGET_GPROF=y" *-softmmu/config-target.mak 2>/dev/null ; then
+    echo "GPROF is enabled ==> Not running the qemu-iotests."
+    exit 0
 fi
 
-export QEMU_PROG="$PWD/x86_64-softmmu/qemu-system-x86_64"
-export QEMU_IMG_PROG="$PWD/qemu-img"
-export QEMU_IO_PROG="$PWD/qemu-io"
+if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then
+    echo "No qemu-system binary available ==> Not running the qemu-iotests."
+    exit 0
+fi
+
+if ! command -v bash >/dev/null 2>&1 ; then
+    echo "bash not available ==> Not running the qemu-iotests."
+    exit 0
+fi
 
-if [ ! -x $QEMU_PROG ]; then
-    echo "'make check-block' requires qemu-system-x86_64"
-    exit 1
+if ! (sed --version | grep 'GNU sed') > /dev/null 2>&1 ; then
+    if ! command -v gsed >/dev/null 2>&1; then
+        echo "GNU sed not available ==> Not running the qemu-iotests."
+        exit 0
+    fi
 fi
 
 cd tests/qemu-iotests
 
 ret=0
-for FMT in $FORMAT_LIST ; do
-    ./check -T -nocache -$FMT || ret=1
+for fmt in $format_list ; do
+    ./check -makecheck -$fmt $group || ret=1
 done
 
 exit $ret
diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh
deleted file mode 100755
index 0e554bb972..0000000000
--- a/tests/qemu-iotests-quick.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-cd tests/qemu-iotests
-
-ret=0
-TEST_DIR=${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g quick || ret=1
-
-exit $ret
-- 
2.21.0