Commit 9850d20c authored by Michel Dänzer's avatar Michel Dänzer Committed by Adam Jackson
Browse files

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.

(cherry picked from commit 432fad04)
parent fcac9b10
...@@ -64,8 +64,6 @@ debian-testing: ...@@ -64,8 +64,6 @@ debian-testing:
- ccache/ - ccache/
variables: variables:
LC_ALL: C.UTF-8 LC_ALL: C.UTF-8
PIGLIT_DIR: /root/piglit
XTEST_DIR: /root/xts
before_script: before_script:
- export CCACHE_BASEDIR="$PWD" - export CCACHE_BASEDIR="$PWD"
- export CCACHE_DIR="$PWD/ccache" - export CCACHE_DIR="$PWD/ccache"
...@@ -81,9 +79,10 @@ autotools-build-and-test: ...@@ -81,9 +79,10 @@ autotools-build-and-test:
script: script:
- mkdir build/ - mkdir build/
- cd build/ - cd build/
- ../autogen.sh --prefix=/usr
- make -j$(nproc) distcheck
- | - |
../autogen.sh --prefix=/usr export PIGLIT_DIR=/root/piglit XTEST_DIR=/root/xts
make -j$(nproc) install
set +e set +e
set -x set -x
make -j$(nproc) check make -j$(nproc) check
...@@ -93,6 +92,9 @@ autotools-build-and-test: ...@@ -93,6 +92,9 @@ autotools-build-and-test:
meson-build-and-test: meson-build-and-test:
extends: .common-build-and-test extends: .common-build-and-test
variables:
PIGLIT_DIR: /root/piglit
XTEST_DIR: /root/xts
script: script:
- meson -Dprefix=/usr build/ - meson -Dprefix=/usr build/
- | - |
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment