luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 11:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ci-timeout-mult' into 'master'

Browse Source 
tests: Increase the timeout of the 'objects2' and 'sequence' tests

Closes #1393

See merge request GNOME/glib!23
This commit is contained in:
Philip Withnall 2018-05-27 00:21:53 +00:00
commit ab116c3111
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci.yml
View File

@ -9,6 +9,9 @@ cache:
paths: paths:
- _ccache/ - _ccache/
variables:
MESON_TEST_TIMEOUT_MULTIPLIER: 2
fedora-meson-x86_64: fedora-meson-x86_64:
stage: build stage: build
variables: variables:
@ -17,7 +20,7 @@ fedora-meson-x86_64:
- meson --prefix /usr --libdir /usr/lib64 --buildtype debug --werror -Dsystemtap=true -Ddtrace=true _build . - meson --prefix /usr --libdir /usr/lib64 --buildtype debug --werror -Dsystemtap=true -Ddtrace=true _build .
- cd _build - cd _build
- ninja - ninja
- meson test --timeout-multiplier 2 - meson test --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER}
- cd .. - cd ..
- mkdir -p _coverage - mkdir -p _coverage
- lcov --rc lcov_branch_coverage=1 --directory . --capture --no-external --output-file "_coverage/${CI_JOB_NAME}.lcov" - lcov --rc lcov_branch_coverage=1 --directory . --capture --no-external --output-file "_coverage/${CI_JOB_NAME}.lcov"

2
.gitlab-ci/test-msvc.bat
View File

@ -8,7 +8,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary
meson _build || goto :error meson _build || goto :error
ninja -C _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? :: FIXME: can we get code coverage support?

2
.gitlab-ci/test-msys2.sh
View File

@ -35,7 +35,7 @@ cd _build
ninja ninja
# FIXME: fix the test suite # FIXME: fix the test suite
meson test || true meson test --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER} || true
cd .. cd ..
curl -O -J -L "https://github.com/linux-test-project/lcov/releases/download/v1.13/lcov-1.13.tar.gz" curl -O -J -L "https://github.com/linux-test-project/lcov/releases/download/v1.13/lcov-1.13.tar.gz"

2
glib/tests/meson.build
View File

@ -121,7 +121,7 @@ foreach test_name : glib_tests
) )
# These tests may take more than 30 seconds to run on the CI infrastructure # These tests may take more than 30 seconds to run on the CI infrastructure
if slow_tests.contains(test_name) 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 else
test(test_name, exe, env : test_env) test(test_name, exe, env : test_env)
endif endif

2
tests/refcount/meson.build
View File

@ -1,7 +1,7 @@
refcount_tests = [ refcount_tests = [
['closures', 'closures.c', []], ['closures', 'closures.c', []],
['objects', 'objects.c', []], ['objects', 'objects.c', []],
['objects2', 'objects2.c', []], ['objects2', 'objects2.c', [], 90],
['properties', 'properties.c', []], ['properties', 'properties.c', []],
['properties2', 'properties2.c', []], ['properties2', 'properties2.c', []],
['properties3', 'properties3.c', [], 90], # extra long timeout ['properties3', 'properties3.c', [], 90], # extra long timeout