diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2021-02-11 05:48:52 -0500 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-03-06 11:42:57 +0100 |
commit | dc1d91ac567c49cf07d8312c97b4a02e25047d50 (patch) | |
tree | 81930fb605a5a72b0722bd9d0b3774d9795c5f7c | |
parent | ff012d9a52ea2ee9223ad5c78d19c0c6b6898690 (diff) | |
download | qemu-dc1d91ac567c49cf07d8312c97b4a02e25047d50.zip qemu-dc1d91ac567c49cf07d8312c97b4a02e25047d50.tar.gz qemu-dc1d91ac567c49cf07d8312c97b4a02e25047d50.tar.bz2 |
meson: adjust timeouts for some slower tests
Adjust the timeouts for the benchmarks (Meson 0.57 allows 0 to mean
infinite) and for the longest running tests. These are the
times that I measured and the corresponding timeouts. For generic
qtests, the target that reported the longest runtime is included.
unit tests:
test-crypto-tlscredsx509 13.15s 45s
test-crypto-tlssession 14.12s 45s
qtests:
qos-test 21.26s 60s (i386)
ahci-test 22.18s 60s
pxe-test 26.51s 60s
boot-serial-test 28.02s 60s (sparc)
prom-env-test 28.86s 60s
bios-tables-test 50.17s 120s (aarch64)
test-hmp 57.15s 120s (aarch64)
npcm7xx_pwm-test 71.27s 150s
migration-test 97.09s 150s (aarch64)
qom-test 139.20s 240s (aarch64)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r-- | tests/fp/meson.build | 2 | ||||
-rw-r--r-- | tests/meson.build | 8 | ||||
-rw-r--r-- | tests/qtest/meson.build | 15 |
3 files changed, 24 insertions, 1 deletions
diff --git a/tests/fp/meson.build b/tests/fp/meson.build index 8d739c4..1c3eee9 100644 --- a/tests/fp/meson.build +++ b/tests/fp/meson.build @@ -624,7 +624,7 @@ test('fp-test-mulAdd', fptest, # no fptest_rounding_args args: fptest_args + ['f16_mulAdd', 'f32_mulAdd', 'f64_mulAdd', 'f128_mulAdd'], - suite: ['softfloat-slow', 'softfloat-ops-slow'], timeout: 60) + suite: ['softfloat-slow', 'softfloat-ops-slow'], timeout: 90) fpbench = executable( 'fp-bench', diff --git a/tests/meson.build b/tests/meson.build index 7d7da6a..656d211 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -237,6 +237,11 @@ test_env = environment() test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) +slow_tests = { + 'test-crypto-tlscredsx509': 45, + 'test-crypto-tlssession': 45 +} + foreach test_name, extra: tests src = [test_name + '.c'] deps = [qemuutil] @@ -254,6 +259,8 @@ foreach test_name, extra: tests env: test_env, args: ['--tap', '-k'], protocol: 'tap', + timeout: slow_tests.get(test_name, 30), + priority: slow_tests.get(test_name, 30), suite: ['unit']) endforeach @@ -263,6 +270,7 @@ foreach bench_name, deps: benchs benchmark(bench_name, exe, args: ['--tap', '-k'], protocol: 'tap', + timeout: 0, suite: ['speed']) endforeach diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index ba6ecae..8c79d5c 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -4,6 +4,19 @@ if not config_host.has_key('CONFIG_POSIX') subdir_done() endif +slow_qtests = { + 'ahci-test' : 60, + 'bios-tables-test' : 120, + 'boot-serial-test' : 60, + 'migration-test' : 150, + 'npcm7xx_pwm-test': 150, + 'prom-env-test' : 60, + 'pxe-test' : 60, + 'qos-test' : 60, + 'qom-test' : 300, + 'test-hmp' : 120, +} + qtests_generic = [ 'cdrom-test', 'device-introspect-test', @@ -273,6 +286,8 @@ foreach dir : target_dirs env: qtest_env, args: ['--tap', '-k'], protocol: 'tap', + timeout: slow_qtests.get(test, 30), + priority: slow_qtests.get(test, 30), suite: ['qtest', 'qtest-' + target_base]) endforeach endforeach |