[glib: 5/10] tests: Rework slow test handling for GIO tests
- From: Xavier Claessens <xclaesse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 5/10] tests: Rework slow test handling for GIO tests
- Date: Fri, 13 Jul 2018 15:48:07 +0000 (UTC)
commit cfc26b5a41d0420e8790353b398bd3b50ee4abc1
Author: Philip Withnall <withnall endlessm com>
Date: Thu Jul 5 17:14:53 2018 +0100
tests: Rework slow test handling for GIO tests
Make it follow the same pattern as in glib/tests/meson.build, using a
slow_tests array.
Signed-off-by: Philip Withnall <withnall endlessm com>
gio/tests/meson.build | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index e2d22f76e..2343f601e 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -65,6 +65,11 @@ gio_tests = [
'testfilemonitor',
'thumbnail-verification',
]
+slow_tests = [
+ 'actions',
+ 'gdbus-export',
+ 'testfilemonitor',
+]
test_extra_programs = [
['gdbus-connection-flush-helper'],
@@ -210,8 +215,9 @@ if host_machine.system() != 'windows'
install : false,
c_args : test_c_args,
dependencies : common_gio_tests_deps + extra_deps)
- if test_name == 'actions' or test_name == 'gdbus-export'
- test(test_name, exe, env : test_env, timeout : 45, suite : ['gio', 'slow'])
+ # These tests may take more than 30 seconds to run on the CI infrastructure
+ if slow_tests.contains(test_name)
+ test(test_name, exe, env : test_env, timeout : 120, suite : ['gio', 'slow'])
else
test(test_name, exe, env : test_env, suite : ['gio'])
endif
@@ -302,8 +308,9 @@ foreach test_name : gio_tests
install : false,
c_args : test_c_args,
dependencies : common_gio_tests_deps + extra_deps)
- if test_name == 'testfilemonitor'
- test(test_name, exe, env : test_env, timeout : 45, suite : ['gio', 'slow'])
+ # These tests may take more than 30 seconds to run on the CI infrastructure
+ if slow_tests.contains(test_name)
+ test(test_name, exe, env : test_env, timeout : 120, suite : ['gio', 'slow'])
else
test(test_name, exe, env : test_env, suite : ['gio'])
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]