summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorChristoph Reiter <reiter.christoph@gmail.com>2018-05-13 19:56:11 +0200
committerChristoph Reiter <reiter.christoph@gmail.com>2018-05-13 21:00:45 +0200
commit27c214480b356f57b58347d707c5ee9d42205659 (patch)
treed75d50045cd520785597dbe73fd22292e93011b8 /.gitlab-ci
parenta90d8299512bf5553d1a5ff8d41c4170e22d16a9 (diff)
downloadpygobject-27c214480b356f57b58347d707c5ee9d42205659.tar.gz
ci/meson: build with pypy and run tests
pypy+pycairo doesn't work because it doesn't install a .pc file with it.
Diffstat (limited to '.gitlab-ci')
-rwxr-xr-x.gitlab-ci/test-docker.sh19
1 files changed, 11 insertions, 8 deletions
diff --git a/.gitlab-ci/test-docker.sh b/.gitlab-ci/test-docker.sh
index ec09cf8f..46a195e0 100755
--- a/.gitlab-ci/test-docker.sh
+++ b/.gitlab-ci/test-docker.sh
@@ -24,15 +24,18 @@ python -m pip install flake8 pytest pytest-faulthandler coverage
export CFLAGS="-coverage -ftest-coverage -fprofile-arcs -Werror"
# MESON
-if [[ "${PYIMPL}" != "PyPy" ]]; then
- # https://github.com/mesonbuild/meson/pull/3445
- /usr/bin/python3 -m pip install --user meson
- export PATH="${HOME}/.local/bin:${PATH}"
- export PKG_CONFIG_PATH="$(python -c 'import sys; sys.stdout.write(sys.prefix)')/lib/pkgconfig"
+/usr/bin/python3 -m pip install --user git+https://github.com/mesonbuild/meson.git
+export PATH="${HOME}/.local/bin:${PATH}"
+export PKG_CONFIG_PATH="$(python -c 'import sys; sys.stdout.write(sys.prefix)')/lib/pkgconfig"
+# pycairo install under PyPy doesn't install a .pc file
+if [[ "${PYIMPL}" == "PyPy" ]]; then
+ meson _build -Dpython="$(which python)" -Dpycairo=false
+else
meson _build -Dpython="$(which python)"
- ninja -C _build
- rm -Rf _build
-fi;
+fi
+ninja -C _build
+xvfb-run -a meson test -C _build -v
+rm -Rf _build
# CODE QUALITY
python -m flake8