summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorPhilip Withnall <philip@tecnocode.co.uk>2019-01-15 16:45:15 +0000
committerPhilip Withnall <philip@tecnocode.co.uk>2019-01-15 16:45:15 +0000
commit6a372bf7036312bd59d2c5cf9bfcd034831b3b00 (patch)
treefa2b0ab4650385eeb53cdf3300a28edfa5ae9502 /.gitlab-ci.yml
parent419e1485a56d71277a87039c4c9a205d9f08ed81 (diff)
parent956a54d6d6b08c184a8b71faf71685b93f19e350 (diff)
downloadglib-6a372bf7036312bd59d2c5cf9bfcd034831b3b00.tar.gz
Merge branch 'disable-tests' into 'master'
Temporarily disable flaky tests See merge request GNOME/glib!579
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8019d5d5..765fb5dd9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,7 @@ fedora-x86_64:
- ninja -C _build
- mkdir -p _coverage
- lcov --config-file .gitlab-ci/lcovrc --directory _build --capture --initial --output-file "_coverage/${CI_JOB_NAME}-baseline.lcov"
- - meson test -C _build --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER}
+ - meson test -C _build --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER} --no-suite flaky
- lcov --config-file .gitlab-ci/lcovrc --directory _build --capture --output-file "_coverage/${CI_JOB_NAME}.lcov"
# FIXME: We should run all installed tests, but do only this one for now
# because it cannot run uninstalled. Reconfigure with dtrace disabled
@@ -142,7 +142,7 @@ freebsd-11-x86_64:
# FIXME: extattr(2) support: https://gitlab.gnome.org/GNOME/glib/issues/1404
- meson ${MESON_COMMON_OPTIONS} -Db_lundef=false -Diconv=gnu -Dxattr=false _build
- ninja -C _build
- - meson test -C _build --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}"
+ - meson test -C _build --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" --no-suite flaky
except:
- tags
artifacts: