diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-01-06 22:18:36 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-01-06 22:18:36 +0000 |
| commit | 470dd6bd360782f5137f7e3376af6a44658eb1d3 (patch) | |
| tree | 36b3252ad7736dd02e5dc1daf1ac02b5931a8d58 | |
| parent | aadac5b3d9fdce28030495f80fc76a4336e97328 (diff) | |
| parent | af229fc367021e361cebaf84acceb01f28922cc4 (diff) | |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-060121-4' into staging
Testing updates (back to green)
- include ccache in Debian 10 docker image
- iotests: drop 312 from auto group
- bound reading of s390x framebuffer file
- cirrus: drop non-x86 tests so we complete
# gpg: Signature made Wed 06 Jan 2021 17:31:14 GMT
# gpg: using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44
* remotes/stsquad/tags/pull-testing-060121-4:
cirrus: don't run full qtest on macOS
tests/acceptance: bound the size of readline in s390_ccw_virtio
tests/iotests: drop test 312 from auto group
tests/docker: Include 'ccache' in Debian base image
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | .cirrus.yml | 14 | ||||
| -rw-r--r-- | tests/acceptance/machine_s390_ccw_virtio.py | 2 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/debian10.docker | 1 | ||||
| -rw-r--r-- | tests/qemu-iotests/group | 2 |
4 files changed, 13 insertions, 6 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 62a9b57530..3907e036da 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -18,7 +18,6 @@ freebsd_12_task: - gmake -j$(sysctl -n hw.ncpu) check V=1 macos_task: - timeout_in: 90m osx_instance: image: catalina-base install_script: @@ -30,10 +29,13 @@ macos_task: --extra-cflags='-Wno-error=deprecated-declarations' || { cat config.log meson-logs/meson-log.txt; exit 1; } - gmake -j$(sysctl -n hw.ncpu) - - gmake check V=1 + - gmake check-unit V=1 + - gmake check-block V=1 + - gmake check-qapi-schema V=1 + - gmake check-softfloat V=1 + - gmake check-qtest-x86_64 V=1 macos_xcode_task: - timeout_in: 90m osx_instance: # this is an alias for the latest Xcode image: catalina-xcode @@ -45,7 +47,11 @@ macos_xcode_task: - ../configure --extra-cflags='-Wno-error=deprecated-declarations' --enable-modules --enable-werror --cc=clang || { cat config.log meson-logs/meson-log.txt; exit 1; } - gmake -j$(sysctl -n hw.ncpu) - - gmake check V=1 + - gmake check-unit V=1 + - gmake check-block V=1 + - gmake check-qapi-schema V=1 + - gmake check-softfloat V=1 + - gmake check-qtest-x86_64 V=1 windows_msys2_task: timeout_in: 90m diff --git a/tests/acceptance/machine_s390_ccw_virtio.py b/tests/acceptance/machine_s390_ccw_virtio.py index 0f81af9950..eccf26b262 100644 --- a/tests/acceptance/machine_s390_ccw_virtio.py +++ b/tests/acceptance/machine_s390_ccw_virtio.py @@ -241,7 +241,7 @@ class S390CCWVirtioMachine(Test): self.assertEqual(line, b"1024 768\n") line = ppmfile.readline() self.assertEqual(line, b"255\n") - line = ppmfile.readline() + line = ppmfile.readline(256) self.assertEqual(line, b"The quick fox jumps over a lazy dog\n") # Hot-plug a virtio-crypto device and see whether it gets accepted diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker index 73a3caac9c..9d42b5a4b8 100644 --- a/tests/docker/dockerfiles/debian10.docker +++ b/tests/docker/dockerfiles/debian10.docker @@ -20,6 +20,7 @@ RUN apt update && \ bc \ build-essential \ ca-certificates \ + ccache \ clang \ dbus \ gdb-multiarch \ diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index e4fb6327ae..bc5bc324fe 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -318,4 +318,4 @@ 307 rw quick export 308 rw 309 rw auto quick -312 rw auto quick +312 rw quick |