diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-09-26 19:49:08 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-09-26 19:49:08 +0100 |
| commit | 31bc1d8481af414cfa2857f905e40f7d8e6d5b2e (patch) | |
| tree | 4f7198397d7f32c8880490f69b91e5d50731e678 /tests | |
| parent | 2509dda283d438970028864dd89871bfe0263c3a (diff) | |
| parent | 35deebb2327227d8c5f4816476befb06f6329de6 (diff) | |
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging
trivial patches for 2017-09-26
# gpg: Signature made Tue 26 Sep 2017 07:13:16 BST
# gpg: using RSA key 0x701B4F6B1A693E59
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931 4B22 701B 4F6B 1A69 3E59
* remotes/mjt/tags/trivial-patches-fetch: (29 commits)
hw/isa/pc87312: Mark the device with user_creatable = false
Drop gld linker usage on SunOS
tests/boot-sector: Increase timeout to 600 seconds
nbd-client: Use correct macro parenthesization
hw/display/virtio-gpu: Put the virtio-gpu-device into the display category
osdep: Fix ROUND_UP(64-bit, 32-bit)
target/xtensa: Use the pre-defined MEMTXATTRS_UNSPECIFIED macro
trivial: Add missing "-m" parameter in docs/memory-hotplug.txt
chardev/baum: fix baum that releases brlapi twice
remove trailing whitespace from qemu-options.hx
hw/display/xenfb.c: Add trace_xenfb_key_event
aux-to-i2c-bridge: don't allow user to create one
util/qemu-thread-posix.c: Replace OS ifdefs with CONFIG_HAVE_SEM_TIMEDWAIT
MAINTAINERS: update docs/interop/ entries
MAINTAINERS: update docs/devel/ entries
MAINTAINERS: add missing Cryptography entry
MAINTAINERS: add missing entry for Generic Loader
MAINTAINERS: add missing AIO entry
MAINTAINERS: add missing entries for throttling infra
MAINTAINERS: add missing SSI entries
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/boot-sector.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/boot-sector.c b/tests/boot-sector.c index 9ee85370b0..be29d5bb9b 100644 --- a/tests/boot-sector.c +++ b/tests/boot-sector.c @@ -137,9 +137,9 @@ void boot_sector_test(void) uint16_t signature; int i; - /* Wait at most 90 seconds */ + /* Wait at most 600 seconds (test is slow with TCI and --enable-debug) */ #define TEST_DELAY (1 * G_USEC_PER_SEC / 10) -#define TEST_CYCLES MAX((90 * G_USEC_PER_SEC / TEST_DELAY), 1) +#define TEST_CYCLES MAX((600 * G_USEC_PER_SEC / TEST_DELAY), 1) /* Poll until code has run and modified memory. Once it has we know BIOS * initialization is done. TODO: check that IP reached the halt |