Commit 13e206aa authored by Simon McVittie's avatar Simon McVittie

meson: Centralize test timeout values

Signed-off-by: 's avatarSimon McVittie <smcv@collabora.com>
parent d3f55597
......@@ -493,7 +493,7 @@ foreach test_name, extra_args : gio_tests
)
suite = ['gio'] + extra_args.get('suite', [])
timeout = suite.contains('slow') ? 120 : 30
timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
test(test_name, exe,
env : test_env,
timeout : timeout,
......
......@@ -188,7 +188,7 @@ foreach test_name, extra_args : glib_tests
)
suite = ['glib'] + extra_args.get('suite', [])
timeout = suite.contains('slow') ? 120 : 30
timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
test(test_name, exe, env : test_env, timeout : timeout, suite : suite,
args : ['--tap'])
endforeach
......
......@@ -89,7 +89,7 @@ foreach test_name, extra_args : gobject_tests
)
suite = ['gobject'] + extra_args.get('suite', [])
timeout = suite.contains('slow') ? 120 : 30
timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
test(test_name, exe, env : test_env, timeout : timeout, suite : suite,
args: ['--tap'])
endforeach
......
......@@ -1972,6 +1972,8 @@ if want_systemtap and enable_dtrace
enable_systemtap = true
endif
test_timeout = 30
test_timeout_slow = 120
pkg = import('pkgconfig')
windows = import('windows')
......
......@@ -83,7 +83,7 @@ foreach test_name, extra_args : gobject_tests
)
suite = ['gobject'] + extra_args.get('suite', [])
timeout = suite.contains('slow') ? 120 : 30
timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
# FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
test(test_name, exe, env : test_env, timeout : timeout, suite : suite,
args : test_command_args)
......
......@@ -124,7 +124,7 @@ foreach test_name, extra_args : tests
)
suite = ['glib'] + extra_args.get('suite', [])
timeout = suite.contains('slow') ? 120 : 30
timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
# FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
test(test_name, exe, env : test_env, timeout : timeout, suite : suite,
args : test_command_args)
......
......@@ -53,7 +53,7 @@ foreach test_name, extra_args : refcount_tests
)
suite = ['refcount'] + extra_args.get('suite', [])
timeout = suite.contains('slow') ? 120 : 30
timeout = suite.contains('slow') ? test_timeout_slow : test_timeout
# FIXME? TESTS_ENVIRONMENT = LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
test(test_name, exe, env : test_env, timeout : timeout, suite : suite)
endforeach
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment