summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2021-05-16 14:34:58 +0200
committerCarlos Garnacho <carlosg@gnome.org>2021-05-16 23:28:36 +0200
commit6bcd2ea2c419ddf47fd71a2958375c21c525fc46 (patch)
tree11b9a82e6f2b9842bb01e71bf38e42cc56ef9da0
parent8f1d6f64921e3d2632152618cbcdbb6ee62de528 (diff)
downloadtracker-6bcd2ea2c419ddf47fd71a2958375c21c525fc46.tar.gz
ci: Add test timeout multiplier
So we can expand test timeouts in CI without making it horribly slow on the desktop.
-rw-r--r--.gitlab-ci.yml1
-rw-r--r--tests/functional-tests/ipc/meson.build2
-rw-r--r--tests/functional-tests/meson.build2
-rw-r--r--tests/libtracker-data/meson.build2
4 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5328a4b16..81b7e60d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,7 @@ include:
- remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/290b79e0e78eab67a83766f4e9691be554fc4afd/templates/ubuntu.yml'
variables:
+ MESON_TEST_TIMEOUT_MULTIPLIER: 3
# These can be used to see verbose log output from the functional-tests.
# See HACKING.md for more information.
TRACKER_DEBUG: ""
diff --git a/tests/functional-tests/ipc/meson.build b/tests/functional-tests/ipc/meson.build
index fd8a58cbc..4aaa334b8 100644
--- a/tests/functional-tests/ipc/meson.build
+++ b/tests/functional-tests/ipc/meson.build
@@ -13,4 +13,4 @@ bus_query_cancellation_test = executable('test-bus-query-cancellation',
test('bus-query-cancellation', bus_query_cancellation_test,
env: test_env,
suite: ['functional', 'ipc'],
- timeout: 60)
+ timeout: 30)
diff --git a/tests/functional-tests/meson.build b/tests/functional-tests/meson.build
index c0a3b4bd6..23f514d09 100644
--- a/tests/functional-tests/meson.build
+++ b/tests/functional-tests/meson.build
@@ -51,7 +51,7 @@ foreach test_name: functional_tests
env: test_env,
protocol: protocol,
suite: ['functional'],
- timeout: 60)
+ timeout: 30)
endforeach
subdir('ipc')
diff --git a/tests/libtracker-data/meson.build b/tests/libtracker-data/meson.build
index e7386b851..3ba1ddf5e 100644
--- a/tests/libtracker-data/meson.build
+++ b/tests/libtracker-data/meson.build
@@ -44,6 +44,6 @@ foreach base_name: libtracker_data_slow_tests
'name': base_name,
'exe': binary,
'suite': ['data', 'slow'],
- 'timeout': 280
+ 'timeout': 100
}
endforeach