From: Thomas Huth <th...@redhat.com>
We are going to move these settings into target-specific subfolders.
As a first step, split the big test_timeouts array up into individual
ones.
Signed-off-by: Thomas Huth <th...@redhat.com>
---
tests/functional/meson.build | 50 +++++++++++++++++++++++++++++++-----
1 file changed, 44 insertions(+), 6 deletions(-)
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index 19ea85a6361..d0c01303654 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -10,7 +10,7 @@ if get_option('tcg_interpreter')
endif
# Timeouts for individual tests that can be slow e.g. with debugging enabled
-test_timeouts = {
+test_aarch64_timeouts = {
'aarch64_aspeed_ast2700' : 600,
'aarch64_aspeed_ast2700fc' : 600,
'aarch64_device_passthrough' : 720,
@@ -25,7 +25,9 @@ test_timeouts = {
'aarch64_tuxrun' : 240,
'aarch64_virt' : 360,
'aarch64_virt_gpu' : 480,
- 'acpi_bits' : 420,
+}
+
+test_arm_timeouts = {
'arm_aspeed_palmetto' : 120,
'arm_aspeed_romulus' : 120,
'arm_aspeed_witherspoon' : 120,
@@ -44,24 +46,55 @@ test_timeouts = {
'arm_replay' : 240,
'arm_tuxrun' : 240,
'arm_sx1' : 360,
- 'intel_iommu': 300,
+}
+
+test_mips_timeouts = {
'mips_malta' : 480,
+}
+
+test_mipsel_timeouts = {
'mipsel_malta' : 420,
'mipsel_replay' : 480,
+}
+
+test_mips64_timeouts = {
'mips64_malta' : 240,
+}
+
+test_mips64el_timeouts = {
'mips64el_malta' : 420,
'mips64el_replay' : 180,
- 'netdev_ethtool' : 180,
+}
+
+test_ppc_timeouts = {
'ppc_40p' : 240,
+}
+
+test_ppc64_timeouts = {
'ppc64_hv' : 1000,
'ppc64_powernv' : 480,
'ppc64_pseries' : 480,
'ppc64_replay' : 210,
'ppc64_tuxrun' : 420,
'ppc64_mac99' : 120,
+}
+
+test_riscv64_timeouts = {
'riscv64_tuxrun' : 120,
+}
+
+test_s390x_timeouts = {
's390x_ccw_virtio' : 420,
+}
+
+test_sh4_timeouts = {
'sh4_tuxrun' : 240,
+}
+
+test_x86_64_timeouts = {
+ 'acpi_bits' : 420,
+ 'intel_iommu': 300,
+ 'netdev_ethtool' : 180,
'virtio_balloon': 120,
'x86_64_kvm_xen' : 180,
'x86_64_replay' : 480,
@@ -403,6 +436,11 @@ foreach speed : ['quick', 'thorough']
build_by_default: false,
env: test_precache_env)
precache_all += precache
+ if is_variable('test_' + target_base + '_timeouts')
+ time_out = get_variable('test_' + target_base + '_timeouts').get(test,
90)
+ else
+ time_out = 90
+ endif
# Ideally we would add 'precache' to 'depends' here, such that
# 'build_by_default: false' lets the pre-caching automatically
@@ -418,8 +456,8 @@ foreach speed : ['quick', 'thorough']
env: test_env,
args: [testpath],
protocol: 'tap',
- timeout: test_timeouts.get(test, 90),
- priority: test_timeouts.get(test, 90),
+ timeout: time_out,
+ priority: time_out,
suite: suites)
endforeach
endforeach
--
2.50.1
