From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Fri, 15 Nov 2019 11:02:08 +0000 (+0100)
Subject: gitlab-ci: move building piglit into a separate script
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=24dd730efcf978cde5db4e314485d7d3d2ab3720;p=mesa.git

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>
---

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