a8263c0693
- Include upstream patches designated as stable material and reviewed for applicability to include here block-Separate-blk_is_writable-and-blk_s.patch hw-intc-arm_gic-Fix-interrupt-ID-in-GICD.patch hw-net-lan9118-Fix-RX-Status-FIFO-PEEK-v.patch hw-timer-slavio_timer-Allow-64-bit-acces.patch net-Fix-handling-of-id-in-netdev_add-and.patch target-arm-Don-t-decode-insns-in-the-XSc.patch target-arm-Fix-MTE0_ACTIVE.patch target-arm-Introduce-PREDDESC-field-defi.patch target-arm-Update-PFIRST-PNEXT-for-pred_.patch target-arm-Update-REV-PUNPK-for-pred_des.patch target-arm-Update-ZIP-UZP-TRN-for-pred_d.patch tcg-Use-memset-for-large-vector-byte-rep.patch ui-vnc-Add-missing-lock-for-send_color_m.patch virtio-move-use-disabled-flag-property-t.patch - binutils v2.36 has changed the handling of the assembler's -mx86-used-note, resulting in a build failure. To compensate, we now explicitly specify -mx86-used-note=no in the seabios Makefile (boo#1181775) build-be-explicit-about-mx86-used-note-n.patch OBS-URL: https://build.opensuse.org/request/show/869843 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=614
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
From: Bruce Rogers <brogers@suse.com>
|
|
Date: Tue, 20 Nov 2018 15:46:41 -0700
|
|
Subject: tests/qemu-iotests: Triple timeout of i/o tests due to obs
|
|
environment
|
|
|
|
Executing tests in obs is very fickle, since you aren't guaranteed
|
|
reliable cpu time. Triple the timeout for each test to help ensure
|
|
we don't fail a test because the stars align against us.
|
|
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
tests/qemu-iotests/common.qemu | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/tests/qemu-iotests/common.qemu b/tests/qemu-iotests/common.qemu
|
|
index ef105dfc393e96c6ef2f34c1466d..3ecff3edfa7569d49ec7d81c2195 100644
|
|
--- a/tests/qemu-iotests/common.qemu
|
|
+++ b/tests/qemu-iotests/common.qemu
|
|
@@ -76,7 +76,7 @@ _timed_wait_for()
|
|
timeout=yes
|
|
|
|
QEMU_STATUS[$h]=0
|
|
- while IFS= read -t ${QEMU_COMM_TIMEOUT} resp <&${QEMU_OUT[$h]}
|
|
+ while IFS= read -t $((${QEMU_COMM_TIMEOUT}*3)) resp <&${QEMU_OUT[$h]}
|
|
do
|
|
if [ -z "${silent}" ] && [ -z "${mismatch_only}" ]; then
|
|
echo "${resp}" | _filter_testdir | _filter_qemu \
|