Commit 5dfdcb37 authored by Christoph Reiter's avatar Christoph Reiter 🐍

ci: unify the test timeout multiplier across jobs

Introduce a MESON_TEST_TIMEOUT_MULTIPLIER env var and use it in all test scripts.
parent e8945343
......@@ -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"
......
......@@ -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?
......
......@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment