gitlab-ci: append Fossilize stdout/stderr to a file to reduce spam

[mesa.git] / .gitlab-ci / build-deqp-gl.sh

diff --git a/.gitlab-ci/build-deqp-gl.sh b/.gitlab-ci/build-deqp-gl.sh
index 63164956f0c8bd4ffc3fbe1354a03cc34a231af2..34456e7071c7c97735287f6df03707ccc5d41cf7 100644 (file)
--- 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
 pushd /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
@@ -38,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:
@@ -49,13 +53,15 @@ 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
 find -iname '*cmake*' -o -name '*ninja*' -o -name '*.o' -o -name '*.a' | xargs rm -rf
-${STRIP_CMD:-strip} modules/*/deqp-*
+${STRIP_CMD:-strip} modules/*/deqp-* external/openglcts/modules/glcts
 du -sh *
 rm -rf /VK-GL-CTS
 popd