summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorChristoph Reiter <reiter.christoph@gmail.com>2018-11-25 15:13:59 +0100
committerChristoph Reiter <reiter.christoph@gmail.com>2018-11-25 22:45:08 +0100
commitc6825ff9b2e0b5e0b79224a482ebd7b0418d36a9 (patch)
tree977d66eeb67e6d1710bc691d47aa2204fb6d8c1b /.gitlab-ci
parent62b16247b9230a975d85e749da9f1b199fbc3c84 (diff)
downloadpygobject-c6825ff9b2e0b5e0b79224a482ebd7b0418d36a9.tar.gz
gtk overrides: improve coverage
Also collect coverage for the gtk4 and xenial jobs
Diffstat (limited to '.gitlab-ci')
-rwxr-xr-x.gitlab-ci/test-docker-gtk4.sh10
-rwxr-xr-x.gitlab-ci/test-docker-old.sh10
-rwxr-xr-x.gitlab-ci/test-flatpak.sh4
3 files changed, 16 insertions, 8 deletions
diff --git a/.gitlab-ci/test-docker-gtk4.sh b/.gitlab-ci/test-docker-gtk4.sh
index e36c715d..0dd12199 100755
--- a/.gitlab-ci/test-docker-gtk4.sh
+++ b/.gitlab-ci/test-docker-gtk4.sh
@@ -3,13 +3,17 @@
set -e
# ccache setup
-mkdir -p _ccache
export CCACHE_BASEDIR="$(pwd)"
export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
+COV_DIR="$(pwd)/coverage"
+export COVERAGE_FILE="${COV_DIR}/.coverage.${CI_JOB_NAME}"
+mkdir -p "${COV_DIR}"
+mkdir -p "${CCACHE_DIR}"
# test
python -m pip install git+https://github.com/pygobject/pycairo.git
-python -m pip install pytest pytest-faulthandler
+python -m pip install pytest pytest-faulthandler coverage
g-ir-inspect Gtk --version=4.0 --print-typelibs
export TEST_GTK_VERSION=4.0
-xvfb-run -a python setup.py test
+python setup.py build_tests
+xvfb-run -a python -m coverage run tests/runtests.py
diff --git a/.gitlab-ci/test-docker-old.sh b/.gitlab-ci/test-docker-old.sh
index 74c81c77..91312c7c 100755
--- a/.gitlab-ci/test-docker-old.sh
+++ b/.gitlab-ci/test-docker-old.sh
@@ -7,11 +7,15 @@ virtualenv --python=python _venv
source _venv/bin/activate
# ccache setup
-mkdir -p _ccache
export CCACHE_BASEDIR="$(pwd)"
export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
+COV_DIR="$(pwd)/coverage"
+export COVERAGE_FILE="${COV_DIR}/.coverage.${CI_JOB_NAME}"
+mkdir -p "${COV_DIR}"
+mkdir -p "${CCACHE_DIR}"
# test
python -m pip install git+https://github.com/pygobject/pycairo.git
-python -m pip install pytest pytest-faulthandler
-xvfb-run -a python setup.py test
+python -m pip install pytest pytest-faulthandler coverage
+python setup.py build_tests
+xvfb-run -a python -m coverage run tests/runtests.py
diff --git a/.gitlab-ci/test-flatpak.sh b/.gitlab-ci/test-flatpak.sh
index 3e3a9923..3ca5a746 100755
--- a/.gitlab-ci/test-flatpak.sh
+++ b/.gitlab-ci/test-flatpak.sh
@@ -2,5 +2,5 @@
set -e
-python3 -m pip install --user pytest
-python3 setup.py test
+python3 -m pip install --user pytest pytest-faulthandler
+python3 setup.py test -s