diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2023-05-02 06:36:18 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2023-05-02 06:38:30 -0400 |
| commit | 81f5967587054e27c2852fcf728288c20c9d83e7 (patch) | |
| tree | a308b2438b6b9884bbba10a838719ae8bcb0f8d8 /.gitlab-ci | |
| parent | 771437acf96f9c9e7e257a9fb23e48956db25cd9 (diff) | |
| download | gtk+-81f5967587054e27c2852fcf728288c20c9d83e7.tar.gz | |
Make run-test.sh easier to use locally
Set a default timeout multiplier so we don't
have to rememver obscure environment variables.
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/run-tests.sh | 13 |
1 files changed, 7 insertions, 6 deletions
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 \ |