gitlab-ci: Run make distcheck in autotools build & test job

We don't set the PIGLIT_DIR and XTS_DIR environment variables for make
distcheck for now, otherwise it complains about files left behind by
piglit.
This commit is contained in:
Michel Dänzer 2019-02-22 10:22:49 +01:00 committed by Michel Dänzer
parent f9bbc9d5ea
commit 432fad04e7
1 changed files with 6 additions and 4 deletions

View File

@ -64,8 +64,6 @@ debian-testing:
- ccache/
variables:
LC_ALL: C.UTF-8
PIGLIT_DIR: /root/piglit
XTEST_DIR: /root/xts
before_script:
- export CCACHE_BASEDIR="$PWD"
- export CCACHE_DIR="$PWD/ccache"
@ -81,9 +79,10 @@ autotools-build-and-test:
script:
- mkdir build/
- cd build/
- ../autogen.sh --prefix=/usr
- make -j$(nproc) distcheck
- |
../autogen.sh --prefix=/usr
make -j$(nproc) install
export PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts
set +e
set -x
make -j$(nproc) check
@ -93,6 +92,9 @@ autotools-build-and-test:
meson-build-and-test:
extends: .common-build-and-test
variables:
PIGLIT_DIR: /root/piglit
XTEST_DIR: /root/xts
script:
- meson -Dprefix=/usr build/
- |