From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 2 May 2023 10:36:18 +0000 (-0400)
Subject: Make run-test.sh easier to use locally
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~319^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=81f5967587054e27c2852fcf728288c20c9d83e7;p=gtk4.git

Make run-test.sh easier to use locally

Set a default timeout multiplier so we don't
have to rememver obscure environment variables.
---

diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh
index 4a206ef2b0..e06668ec8c 100755
--- a/.gitlab-ci/run-tests.sh
+++ b/.gitlab-ci/run-tests.sh
@@ -6,6 +6,7 @@ set +e
 srcdir=$( pwd )
 builddir=$1
 backend=$2
+multiplier=${MESON_TEST_TIMEOUT_MULTIPLIER:-1}
 
 # Ignore memory leaks lower in dependencies
 export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:verbosity=1:log_threads=1
@@ -15,7 +16,7 @@ case "${backend}" in
   x11)
     xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
           meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
+                --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
                 --setup=${backend} \
                 --suite=gtk \
@@ -29,7 +30,7 @@ case "${backend}" in
 
     xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
           meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
+                --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
                 --setup=${backend}_unstable \
                 --suite=flaky \
@@ -44,7 +45,7 @@ case "${backend}" in
     export WAYLAND_DISPLAY=wayland-5
 
     meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
+                --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
                 --setup=${backend} \
                 --suite=gtk \
@@ -55,7 +56,7 @@ case "${backend}" in
     exit_code=$?
 
     meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
+                --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
                 --setup=${backend}_unstable \
                 --suite=flaky \
@@ -72,7 +73,7 @@ case "${backend}" in
     export BROADWAY_DISPLAY=:5
 
     meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
+                --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
                 --setup=${backend} \
                 --suite=gtk \
@@ -84,7 +85,7 @@ case "${backend}" in
     exit_code=0
 
     meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
+                --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
                 --setup=${backend}_unstable \
                 --suite=flaky \