From 5dfdcb372f4eef880cfb197365165c6a29655a6e Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sat, 26 May 2018 20:17:15 +0200
Subject: [PATCH] ci: unify the test timeout multiplier across jobs

Introduce a MESON_TEST_TIMEOUT_MULTIPLIER env var and use it in all test scripts.
---
 .gitlab-ci.yml           | 5 ++++-
 .gitlab-ci/test-msvc.bat | 2 +-
 .gitlab-ci/test-msys2.sh | 2 +-
 3 files changed, 6 insertions(+), 3 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"