meson: tests: Allow 'timeout' override for all tests

Don't special-case qemuxml2argvtest's handling of timeout but rather
allow each test array entry to have it's own.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/tests/meson.build b/tests/meson.build
index 4a4042376ad241cf0b64a62758086a1ab4862228..2f0b5e39b70dff8675d3f3f2a1aef32d4e046cf0 100644 (file)
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -455,7 +455,7 @@ if conf.has('WITH_QEMU')
     { 'name': 'qemusecuritytest', 'sources': [ 'qemusecuritytest.c', 'qemusecuritymock.c' ], 'link_with': [ test_qemu_driver_lib ], 'link_whole': [ test_utils_qemu_lib ] },
     { 'name': 'qemuxmlactivetest', 'link_with': [ test_qemu_driver_lib ], 'link_whole': [ test_utils_qemu_lib, test_file_wrapper_lib ] },
     { 'name': 'qemuvhostusertest', 'link_with': [ test_qemu_driver_lib ], 'link_whole': [ test_file_wrapper_lib ] },
-    { 'name': 'qemuxml2argvtest', 'link_with': [ test_qemu_driver_lib, test_utils_qemu_monitor_lib ], 'link_whole': [ test_utils_qemu_lib, test_file_wrapper_lib ] },
+    { 'name': 'qemuxml2argvtest', 'timeout': 90, 'link_with': [ test_qemu_driver_lib, test_utils_qemu_monitor_lib ], 'link_whole': [ test_utils_qemu_lib, test_file_wrapper_lib ] },
   ]
   if conf.has('WITH_NBDKIT')
     tests += [
@@ -595,17 +595,11 @@ foreach data : tests
     ],
     export_dynamic: true,
   )
-  if data['name'] == 'qemuxml2argvtest'
-    timeout = 90
-  else
-    # default meson timeout
-    timeout = 30
-  endif
   test(
     data['name'],
     test_bin,
     env: tests_env,
-    timeout: timeout,
+    timeout: data.get('timeout', 30),
     depends: tests_deps,
     suite: 'bin'
   )