diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2019-02-22 10:22:49 +0100 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2019-02-25 13:07:16 -0500 |
| commit | 9850d20c2aa2d8380f2e9c4521ef3c46a6c8fb00 (patch) | |
| tree | 19c74f7ae0c5312841ea78b70194768554f42ecd | |
| parent | fcac9b10c90c8a06c60f563f5ad8da1d4e49b7fc (diff) | |
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 432fad04e7aaad1f10d732a51665ecbe934246c6)
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3e9df00d3..4cb5e7d33 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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/ - | |