X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci%2Fbuild-deqp-gl.sh;h=ef47274ce5c2a87fab83e11e7524b3b82eed1994;hb=8b1ab78985b54623200bc5e90c7149685bb4b7ce;hp=7e4d894f261febeab969e7c874d7f5be39818e14;hpb=7e0ab6aae026eda405456c6495a4b945073c846a;p=mesa.git

diff --git a/.gitlab-ci/build-deqp-gl.sh b/.gitlab-ci/build-deqp-gl.sh
index 7e4d894f261..ef47274ce5c 100644
--- a/.gitlab-ci/build-deqp-gl.sh
+++ b/.gitlab-ci/build-deqp-gl.sh
@@ -1,14 +1,13 @@
+#!/bin/bash
+
 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 \
+    --depth 1 \
     https://github.com/KhronosGroup/VK-GL-CTS.git \
-    -b opengl-es-cts-3.2.5.1 \
+    -b opengl-es-cts-3.2.6.1 \
     /VK-GL-CTS
-cd /VK-GL-CTS
-# Fix surfaceless build
-git cherry-pick -x 22f41e5e321c6dcd8569c4dad91bce89f06b3670
-git cherry-pick -x 1daa8dff73161ea60ead965bd6c9f2a0a2165648
+pushd /VK-GL-CTS
 
 # surfaceless links against libkms and such despite not using it.
 sed -i '/gbm/d' targets/surfaceless/surfaceless.cmake
@@ -24,11 +23,13 @@ mkdir -p /deqp
 
 # Save the testlog stylesheets:
 cp doc/testlog-stylesheet/testlog.{css,xsl} /deqp
+popd
 
-cd /deqp
+pushd /deqp
 cmake -G Ninja \
       -DDEQP_TARGET=surfaceless               \
       -DCMAKE_BUILD_TYPE=Release              \
+      $EXTRA_CMAKE_ARGS                       \
       /VK-GL-CTS
 ninja
 
@@ -36,9 +37,14 @@ ninja
 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/external/openglcts/modules/gl_cts/data/mustpass/gles/aosp_mustpass/3.2.6.x/$gles-master.txt \
         /deqp/mustpass/$gles-master.txt
 done
+cp \
+    /deqp/external/openglcts/modules/gl_cts/data/mustpass/gl/khronos_mustpass/4.6.1.x/*-master.txt \
+    /deqp/mustpass/.
+
+
 
 # Save *some* executor utils, but otherwise strip things down
 # to reduct deqp build size:
@@ -47,12 +53,16 @@ cp /deqp/executor/testlog-to-* /deqp/executor.save
 rm -rf /deqp/executor
 mv /deqp/executor.save /deqp/executor
 
-rm -rf /deqp/external
+ls /deqp/external | grep -v openglcts | xargs rm -rf
 rm -rf /deqp/modules/internal
 rm -rf /deqp/execserver
 rm -rf /deqp/modules/egl
 rm -rf /deqp/framework
+rm -rf /deqp/external/openglcts/modules/gl_cts/data/mustpass
+rm -rf /deqp/external/openglcts/modules/cts-runner
+rm -rf /deqp/external/vulkancts/modules/vulkan/vk-build-programs
 find -iname '*cmake*' -o -name '*ninja*' -o -name '*.o' -o -name '*.a' | xargs rm -rf
-strip modules/*/deqp-*
+${STRIP_CMD:-strip} modules/*/deqp-* external/openglcts/modules/glcts
 du -sh *
 rm -rf /VK-GL-CTS
+popd