Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-08-17' into...
commit3fbd3405d2b0604ea530fc7a1828f19da1e95ff9
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 19 Aug 2019 13:14:09 +0000 (19 14:14 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 19 Aug 2019 13:14:09 +0000 (19 14:14 +0100)
tree408f8dced94b28808b91fbbad5efb87363129c7a
parent9f3a972e225600d76c673ed23da2bcb07f27aa4d
parent72e031f3b80a421b309ce0d1759b26e428f944db
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-08-17' into staging

- Run the iotest during "make check"

# gpg: Signature made Sat 17 Aug 2019 09:46:13 BST
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2019-08-17:
  gitlab-ci: Remove qcow2 tests that are handled by "make check" already
  tests: Run the iotests during "make check" again
  block: fix NetBSD qemu-iotests failure

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>