From 7e0ab6aae026eda405456c6495a4b945073c846a Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 15 Nov 2019 12:05:15 +0100 Subject: gitlab-ci: rename build-deqp.sh to build-deqp-gl.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Samuel Pitoiset Reviewed-by: Michel Dänzer --- .gitlab-ci/build-deqp-gl.sh | 58 ++++++++++++++++++++++++++++++++++++++++ .gitlab-ci/build-deqp.sh | 58 ---------------------------------------- .gitlab-ci/container/arm_test.sh | 4 +-- .gitlab-ci/container/x86_test.sh | 4 +-- 4 files changed, 62 insertions(+), 62 deletions(-) create mode 100644 .gitlab-ci/build-deqp-gl.sh delete mode 100644 .gitlab-ci/build-deqp.sh (limited to '.gitlab-ci') diff --git a/.gitlab-ci/build-deqp-gl.sh b/.gitlab-ci/build-deqp-gl.sh new file mode 100644 index 00000000000..7e4d894f261 --- /dev/null +++ b/.gitlab-ci/build-deqp-gl.sh @@ -0,0 +1,58 @@ +git config --global user.email "mesa@example.com" +git config --global user.name "Mesa CI" +# XXX: Use --depth 1 once we can drop the cherry-picks. +git clone \ + https://github.com/KhronosGroup/VK-GL-CTS.git \ + -b opengl-es-cts-3.2.5.1 \ + /VK-GL-CTS +cd /VK-GL-CTS +# Fix surfaceless build +git cherry-pick -x 22f41e5e321c6dcd8569c4dad91bce89f06b3670 +git cherry-pick -x 1daa8dff73161ea60ead965bd6c9f2a0a2165648 + +# surfaceless links against libkms and such despite not using it. +sed -i '/gbm/d' targets/surfaceless/surfaceless.cmake +sed -i '/libkms/d' targets/surfaceless/surfaceless.cmake +sed -i '/libgbm/d' targets/surfaceless/surfaceless.cmake + +# --insecure is due to SSL cert failures hitting sourceforge for zlib and +# libpng (sigh). The archives get their checksums checked anyway, and git +# always goes through ssh or https. +python3 external/fetch_sources.py --insecure + +mkdir -p /deqp + +# Save the testlog stylesheets: +cp doc/testlog-stylesheet/testlog.{css,xsl} /deqp + +cd /deqp +cmake -G Ninja \ + -DDEQP_TARGET=surfaceless \ + -DCMAKE_BUILD_TYPE=Release \ + /VK-GL-CTS +ninja + +# Copy out the mustpass lists we want from a bunch of other junk. +mkdir /deqp/mustpass +for gles in gles2 gles3 gles31; do + cp \ + /deqp/external/openglcts/modules/gl_cts/data/mustpass/gles/aosp_mustpass/3.2.5.x/$gles-master.txt \ + /deqp/mustpass/$gles-master.txt +done + +# Save *some* executor utils, but otherwise strip things down +# to reduct deqp build size: +mkdir /deqp/executor.save +cp /deqp/executor/testlog-to-* /deqp/executor.save +rm -rf /deqp/executor +mv /deqp/executor.save /deqp/executor + +rm -rf /deqp/external +rm -rf /deqp/modules/internal +rm -rf /deqp/execserver +rm -rf /deqp/modules/egl +rm -rf /deqp/framework +find -iname '*cmake*' -o -name '*ninja*' -o -name '*.o' -o -name '*.a' | xargs rm -rf +strip modules/*/deqp-* +du -sh * +rm -rf /VK-GL-CTS diff --git a/.gitlab-ci/build-deqp.sh b/.gitlab-ci/build-deqp.sh deleted file mode 100644 index 7e4d894f261..00000000000 --- a/.gitlab-ci/build-deqp.sh +++ /dev/null @@ -1,58 +0,0 @@ -git config --global user.email "mesa@example.com" -git config --global user.name "Mesa CI" -# XXX: Use --depth 1 once we can drop the cherry-picks. -git clone \ - https://github.com/KhronosGroup/VK-GL-CTS.git \ - -b opengl-es-cts-3.2.5.1 \ - /VK-GL-CTS -cd /VK-GL-CTS -# Fix surfaceless build -git cherry-pick -x 22f41e5e321c6dcd8569c4dad91bce89f06b3670 -git cherry-pick -x 1daa8dff73161ea60ead965bd6c9f2a0a2165648 - -# surfaceless links against libkms and such despite not using it. -sed -i '/gbm/d' targets/surfaceless/surfaceless.cmake -sed -i '/libkms/d' targets/surfaceless/surfaceless.cmake -sed -i '/libgbm/d' targets/surfaceless/surfaceless.cmake - -# --insecure is due to SSL cert failures hitting sourceforge for zlib and -# libpng (sigh). The archives get their checksums checked anyway, and git -# always goes through ssh or https. -python3 external/fetch_sources.py --insecure - -mkdir -p /deqp - -# Save the testlog stylesheets: -cp doc/testlog-stylesheet/testlog.{css,xsl} /deqp - -cd /deqp -cmake -G Ninja \ - -DDEQP_TARGET=surfaceless \ - -DCMAKE_BUILD_TYPE=Release \ - /VK-GL-CTS -ninja - -# Copy out the mustpass lists we want from a bunch of other junk. -mkdir /deqp/mustpass -for gles in gles2 gles3 gles31; do - cp \ - /deqp/external/openglcts/modules/gl_cts/data/mustpass/gles/aosp_mustpass/3.2.5.x/$gles-master.txt \ - /deqp/mustpass/$gles-master.txt -done - -# Save *some* executor utils, but otherwise strip things down -# to reduct deqp build size: -mkdir /deqp/executor.save -cp /deqp/executor/testlog-to-* /deqp/executor.save -rm -rf /deqp/executor -mv /deqp/executor.save /deqp/executor - -rm -rf /deqp/external -rm -rf /deqp/modules/internal -rm -rf /deqp/execserver -rm -rf /deqp/modules/egl -rm -rf /deqp/framework -find -iname '*cmake*' -o -name '*ninja*' -o -name '*.o' -o -name '*.a' | xargs rm -rf -strip modules/*/deqp-* -du -sh * -rm -rf /VK-GL-CTS diff --git a/.gitlab-ci/container/arm_test.sh b/.gitlab-ci/container/arm_test.sh index 16dc0ddca9a..a6ef7407ccd 100644 --- a/.gitlab-ci/container/arm_test.sh +++ b/.gitlab-ci/container/arm_test.sh @@ -38,9 +38,9 @@ apt-get -y install \ . .gitlab-ci/build-cts-runner.sh -############### Build dEQP +############### Build dEQP GL -. .gitlab-ci/build-deqp.sh +. .gitlab-ci/build-deqp-gl.sh ############### Uninstall the build software diff --git a/.gitlab-ci/container/x86_test.sh b/.gitlab-ci/container/x86_test.sh index ad80ef004c2..6160e8b01f3 100644 --- a/.gitlab-ci/container/x86_test.sh +++ b/.gitlab-ci/container/x86_test.sh @@ -61,9 +61,9 @@ apt-get install -y --no-remove \ . .gitlab-ci/build-cts-runner.sh -############### Build dEQP +############### Build dEQP GL -. .gitlab-ci/build-deqp.sh +. .gitlab-ci/build-deqp-gl.sh ############### Uninstall the build software -- cgit v1.2.3