Enable iotests during "make check"
v3 cover Enable iotests during "make check"
Let's enable the block iotests during "make check" again, to avoid that they get broken so easily by accident (like we've seen many times in the past).
v3:
- Added dependency for "check-block" so that the *-softmmu targets are now built first
- Added 197 and 215 back to gitlab-ci.yml (there is no problem if they do not run in parallel with the qtests)
- Removed 122 from the "auto" group (does not work on ZFS according to Alex)
- Removed 181 and 201 from the "auto" group (they do not work if the default machine of QEMU does not support migration)
v2:
- Added new patch to allow tests without groups, removed the "o_direct" group again.
- Removed some more tests from the "auto" group, like 197 and 215 which were sometimes causing the CI pipelines to fail on gitlab
- Added a patch to remove the "duplicated" tests from the gitlab-ci.yml file.
Thomas Huth (4):
tests/qemu-iotests/check: Allow tests without groups tests/qemu-iotests/group: Remove some more tests from the "auto" group
tests: Run the iotests during "make check" again
gitlab-ci: Remove qcow2 tests that are handled by "make check" already
.gitlab-ci.yml | 13 ++-- tests/Makefile.include | 10 +-- tests/check-block.sh | 44 ++++++++++--- tests/qemu-iotests-quick.sh | 8 --- tests/qemu-iotests/check | 4 +- tests/qemu-iotests/group | 120 ++++++++++++++++++------------------ 6 files changed, 107 insertions(+), 92 deletions(-) delete mode 100755 tests/qemu-iotests-quick.sh
Signature · 1 line
2.21.0
PATCH v3 1/4 tests/qemu-iotests/check: Allow tests without groups
The regular expressions in the "check" script currently expect that there is always a space after the test number in the group file, so you can't have a test in there without a group unless the line still ends with a space - which is quite error prone since some editors might remove spaces at the end of lines automatically.
Thus let's fix the regular expressions so that it is also possible to have lines with one test number only in the group file.
--- tests/qemu-iotests/check | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tests/qemu-iotests/check +2 -2
@@ -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
Signature · 1 line
2.21.0
PATCH v3 2/4 tests/qemu-iotests/group: Remove some more tests from the "auto" group
In reply to Thomas HuthRemove 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.
--- tests/qemu-iotests/group | 120 ++++++++++++++++++++------------------- 1 file changed, 61 insertions(+), 59 deletions(-)
tests/qemu-iotests/group +61 -59
@@ -14,7 +14,9 @@ # 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, work with all kind of host +# filesystems and users (e.g. "nobody" or "root") and must not take too +# much memory and disk space (since CI pipelines tend to fail otherwise). # #
@@ -33,8 +35,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 +44,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 +80,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 +122 rw +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 143 auto quick 144 rw quick 145 quick -146 auto quick +146 quick 147 img 148 rw quick 149 rw sudo
@@ -179,23 +181,23 @@ 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 179 rw auto quick -181 rw auto migration +181 rw migration 182 rw quick 183 rw migration 184 rw auto quick
@@ -210,62 +212,62 @@ 194 rw migration quick 195 rw auto quick 196 rw quick migration -197 rw auto quick +197 rw quick 198 rw 199 rw migration 200 rw -201 rw auto migration +201 rw migration 202 rw quick 203 rw migration 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 +215 rw quick 216 rw quick 217 rw auto quick 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 quick +254 rw backing quick +255 rw quick +256 rw quick
Signature · 1 line
2.21.0
PATCH v3 3/4 tests: Run the iotests during "make check" again
In reply to Thomas HuthPeople 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).
--- tests/Makefile.include | 10 +++++---- tests/check-block.sh | 44 ++++++++++++++++++++++++++++--------- tests/qemu-iotests-quick.sh | 8 ------- 3 files changed, 40 insertions(+), 22 deletions(-) delete mode 100755 tests/qemu-iotests-quick.sh
tests/Makefile.include +6 -4
@@ -142,7 +142,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.
@@ -1092,8 +1092,10 @@ 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) \ + $(patsubst %,%/all,$(filter %-softmmu,$(TARGET_DIRS))) $< .PHONY: $(patsubst %, check-%, $(check-qapi-schema-y))
@@ -1167,7 +1169,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))
tests/check-block.sh +34 -10
58 lines not on this page · raw message
tests/qemu-iotests-quick.sh deleted +0 -8
@@ -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
Signature · 1 line
2.21.0
PATCH v3 4/4 gitlab-ci: Remove qcow2 tests that are handled by "make check" already
In reply to Thomas HuthSince most iotests are now run during "make check" already, we do not need to test them explicitly from the gitlab-ci.yml script anymore. And while we're at it, add some of the new non-auto tests >= 246 instead.
--- .gitlab-ci.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
.gitlab-ci.yml +4 -9
@@ -45,15 +45,10 @@ build-tcg-disabled: - ./check -raw 001 002 003 004 005 008 009 010 011 012 021 025 032 033 048 052 063 077 086 101 104 106 113 147 148 150 151 152 157 159 160 163 170 171 183 184 192 194 197 205 208 215 221 222 226 227 236 - - ./check -qcow2 001 002 003 004 005 007 008 009 010 011 012 013 017 018 019 - 020 021 022 024 025 027 028 029 031 032 033 034 035 036 037 038 - 039 040 042 043 046 047 048 049 050 051 052 053 054 056 057 058 - 060 061 062 063 065 066 067 068 069 071 072 073 074 079 080 082 - 085 086 089 090 091 095 096 097 098 099 102 103 104 105 107 108 - 110 111 114 117 120 122 124 126 127 129 130 132 133 134 137 138 - 139 140 141 142 143 144 145 147 150 151 152 154 155 156 157 158 - 161 165 170 172 174 176 177 179 184 186 187 190 192 194 195 196 - 197 200 202 203 205 208 209 214 215 216 217 218 222 226 227 229 234 + - ./check -qcow2 028 040 051 056 057 058 065 067 068 082 085 091 095 096 102 + 122 124 127 129 132 139 142 144 145 147 151 152 155 157 165 194 + 196 197 200 202 203 205 208 209 215 216 218 222 227 234 246 247 + 248 250 254 255 256 build-user: script:
Signature · 1 line
2.21.0
Quoted 3 lines · Thomas Huth
Let's enable the block iotests during "make check" again, to avoid that they get broken so easily by accident (like we've seen many times in the past).
Queued to testing/next, thanks.
Quoted 25 lines
v3:
- Added dependency for "check-block" so that the *-softmmu targets are now built first
- Added 197 and 215 back to gitlab-ci.yml (there is no problem if they do not run in parallel with the qtests)
- Removed 122 from the "auto" group (does not work on ZFS according to Alex)
- Removed 181 and 201 from the "auto" group (they do not work if the default machine of QEMU does not support migration)v2:
- Added new patch to allow tests without groups, removed the "o_direct" group again.
- Removed some more tests from the "auto" group, like 197 and 215 which were sometimes causing the CI pipelines to fail on gitlab
- Added a patch to remove the "duplicated" tests from the gitlab-ci.yml file.Thomas Huth (4):
tests/qemu-iotests/check: Allow tests without groups tests/qemu-iotests/group: Remove some more tests from the "auto" group
tests: Run the iotests during "make check" again
gitlab-ci: Remove qcow2 tests that are handled by "make check" already
Quoted 8 lines
.gitlab-ci.yml | 13 ++-- tests/Makefile.include | 10 +-- tests/check-block.sh | 44 ++++++++++--- tests/qemu-iotests-quick.sh | 8 --- tests/qemu-iotests/check | 4 +- tests/qemu-iotests/group | 120 ++++++++++++++++++------------------ 6 files changed, 107 insertions(+), 92 deletions(-) delete mode 100755 tests/qemu-iotests-quick.sh
--
Alex Bennée