diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-08-11 15:11:50 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-08-11 15:11:50 +0100 |
| commit | 9db6ffc76676731a25a5538ab71e8ca6ac234f80 (patch) | |
| tree | cdfb74c60955bdc2490338a75fd8976777e94014 /tests | |
| parent | 95766c2cd04395e5712b4d5967b3251f35d537df (diff) | |
| parent | 8565c3ab537e78f3e69977ec2c609dc9417a806e (diff) | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches for 2.10.0-rc3
# gpg: Signature made Fri 11 Aug 2017 15:02:58 BST
# gpg: using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
qemu-iotests: fix 185
file-posix: Do runtime check for ofd lock API
osdep: Add runtime OFD lock detection
qcow2: Check failure of bdrv_getlength()
qcow2: Drop debugging dump_refcounts()
vpc: Check failure of bdrv_getlength()
tests/multiboot: Fix whitespace failure
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/multiboot/run_test.sh | 2 | ||||
| -rwxr-xr-x | tests/qemu-iotests/185 | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/multiboot/run_test.sh b/tests/multiboot/run_test.sh index c8f3da8f37..0278148b43 100755 --- a/tests/multiboot/run_test.sh +++ b/tests/multiboot/run_test.sh @@ -26,7 +26,7 @@ run_qemu() { local kernel=$1 shift - printf %b "\n\n=== Running test case: $kernel $@ ===\n\n" >> test.log + printf %b "\n\n=== Running test case: $kernel $* ===\n\n" >> test.log $QEMU \ -kernel $kernel \ diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185 index 0eda371f27..f5b47e4c1a 100755 --- a/tests/qemu-iotests/185 +++ b/tests/qemu-iotests/185 @@ -156,6 +156,10 @@ _send_qemu_cmd $h \ 'speed': 65536 } }" \ "return" +# If we don't sleep here 'quit' command may be handled before +# the first mirror iteration is done +sleep 0.5 + _send_qemu_cmd $h "{ 'execute': 'quit' }" "return" wait=1 _cleanup_qemu |