diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2018-05-27 00:21:53 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2018-05-27 00:21:53 +0000 |
| commit | ab116c31117a8dd141745db0404b63df04577677 (patch) | |
| tree | 4aa88622ad48ebc5191ff6525e56bc5008609e70 | |
| parent | 545641a8fbaf96639a65c633bc43050f687f85db (diff) | |
| parent | 5dfdcb372f4eef880cfb197365165c6a29655a6e (diff) | |
| download | glib-ab116c31117a8dd141745db0404b63df04577677.tar.gz | |
Merge branch 'ci-timeout-mult' into 'master'
tests: Increase the timeout of the 'objects2' and 'sequence' tests
Closes #1393
See merge request GNOME/glib!23
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | .gitlab-ci/test-msvc.bat | 2 | ||||
| -rwxr-xr-x | .gitlab-ci/test-msys2.sh | 2 | ||||
| -rw-r--r-- | glib/tests/meson.build | 2 | ||||
| -rw-r--r-- | tests/refcount/meson.build | 2 |
5 files changed, 8 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae96804db..ccee2ed0c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,9 @@ cache: paths: - _ccache/ +variables: + MESON_TEST_TIMEOUT_MULTIPLIER: 2 + fedora-meson-x86_64: stage: build variables: @@ -17,7 +20,7 @@ fedora-meson-x86_64: - meson --prefix /usr --libdir /usr/lib64 --buildtype debug --werror -Dsystemtap=true -Ddtrace=true _build . - cd _build - ninja - - meson test --timeout-multiplier 2 + - meson test --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER} - cd .. - mkdir -p _coverage - lcov --rc lcov_branch_coverage=1 --directory . --capture --no-external --output-file "_coverage/${CI_JOB_NAME}.lcov" diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat index 098419d88..69759837f 100644 --- a/.gitlab-ci/test-msvc.bat +++ b/.gitlab-ci/test-msvc.bat @@ -8,7 +8,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary meson _build || goto :error ninja -C _build || goto :error -meson test -C _build --timeout-multiplier 4 || goto :error +meson test -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% || goto :error :: FIXME: can we get code coverage support? diff --git a/.gitlab-ci/test-msys2.sh b/.gitlab-ci/test-msys2.sh index a3b0ef906..20c79e763 100755 --- a/.gitlab-ci/test-msys2.sh +++ b/.gitlab-ci/test-msys2.sh @@ -35,7 +35,7 @@ cd _build ninja # FIXME: fix the test suite -meson test || true +meson test --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER} || true cd .. curl -O -J -L "https://github.com/linux-test-project/lcov/releases/download/v1.13/lcov-1.13.tar.gz" diff --git a/glib/tests/meson.build b/glib/tests/meson.build index c32e7768f..3a037b14b 100644 --- a/glib/tests/meson.build +++ b/glib/tests/meson.build @@ -121,7 +121,7 @@ foreach test_name : glib_tests ) # 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 : 90) + test(test_name, exe, env : test_env, timeout : 120) else test(test_name, exe, env : test_env) endif diff --git a/tests/refcount/meson.build b/tests/refcount/meson.build index 64c0cfbfd..39722de73 100644 --- a/tests/refcount/meson.build +++ b/tests/refcount/meson.build @@ -1,7 +1,7 @@ refcount_tests = [ ['closures', 'closures.c', []], ['objects', 'objects.c', []], - ['objects2', 'objects2.c', []], + ['objects2', 'objects2.c', [], 90], ['properties', 'properties.c', []], ['properties2', 'properties2.c', []], ['properties3', 'properties3.c', [], 90], # extra long timeout |