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>
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user