summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Reiter <reiter.christoph@gmail.com>2018-05-26 16:31:29 +0200
committerChristoph Reiter <reiter.christoph@gmail.com>2018-05-26 16:31:29 +0200
commitebdc7f4dafb3f509b5a2c40876e2d8feea2228ea (patch)
treeb528ea164faed2d9864c44d7ff898a0cc929555e
parent00178f8c8e864d7efa7670720d25d4f3759da105 (diff)
downloadglib-ci-timeout-mult.tar.gz
ci: Always pass --timeout-multiplier 4 to meson test. Fixes #1393ci-timeout-mult
Sometimes the CI machines are a bit slow and tests time out. This should help.
-rw-r--r--.gitlab-ci.yml2
-rwxr-xr-x.gitlab-ci/test-msys2.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae96804db..418380436 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,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 4
- 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-msys2.sh b/.gitlab-ci/test-msys2.sh
index a3b0ef906..f5c2024c5 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 4 || true
cd ..
curl -O -J -L "https://github.com/linux-test-project/lcov/releases/download/v1.13/lcov-1.13.tar.gz"