summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>2019-11-15 12:02:08 +0100
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>2019-11-21 09:33:39 +0100
commit24dd730efcf978cde5db4e314485d7d3d2ab3720 (patch)
tree162b6d8afc05d4e3ecdbf1cbae78df701379682d /.gitlab-ci
parent8fc8e8e8be787173f41e8256b9068322f8f3d78d (diff)
gitlab-ci: move building piglit into a separate script
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com> Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/build-piglit.sh13
-rw-r--r--.gitlab-ci/container/x86_test.sh11
2 files changed, 14 insertions, 10 deletions
diff --git a/.gitlab-ci/build-piglit.sh b/.gitlab-ci/build-piglit.sh
new file mode 100644
index 00000000000..9d61b12d7ab
--- /dev/null
+++ b/.gitlab-ci/build-piglit.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -ex
+
+git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
+pushd /piglit
+git checkout d5aa2cf85503c5339cd8dff04b709acb8085ad93
+patch -p1 <$OLDPWD/.gitlab-ci/piglit/disable-vs_in.diff
+cmake -G Ninja -DCMAKE_BUILD_TYPE=Release
+ninja -j4
+find -name .git -o -name '*ninja*' -o -iname '*cmake*' -o -name '*.[chao]' | xargs rm -rf
+rm -rf target_api
+popd
diff --git a/.gitlab-ci/container/x86_test.sh b/.gitlab-ci/container/x86_test.sh
index 05835114aa4..ad80ef004c2 100644
--- a/.gitlab-ci/container/x86_test.sh
+++ b/.gitlab-ci/container/x86_test.sh
@@ -55,16 +55,7 @@ apt-get install -y --no-remove \
############### Build piglit
-git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
-pushd /piglit
-git checkout d5aa2cf85503c5339cd8dff04b709acb8085ad93
-patch -p1 <$OLDPWD/.gitlab-ci/piglit/disable-vs_in.diff
-cmake -G Ninja -DCMAKE_BUILD_TYPE=Release
-ninja -j4
-find -name .git -o -name '*ninja*' -o -iname '*cmake*' -o -name '*.[chao]' | xargs rm -rf
-rm -rf target_api
-popd
-
+. .gitlab-ci/build-piglit.sh
############### Build dEQP runner