gitlab-ci: add apitrace's DXGI traces support

[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 64e4db0a2bcf8723d73ca19b4e66e253f57cda63..57ce554f6608ecd8f7dac795a0cd1b58d4522ce8 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
-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,8 +23,9 @@ 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              \
@@ -37,7 +37,7 @@ 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
 
@@ -57,3 +57,4 @@ find -iname '*cmake*' -o -name '*ninja*' -o -name '*.o' -o -name '*.a' | xargs r
 ${STRIP_CMD:-strip} modules/*/deqp-*
 du -sh *
 rm -rf /VK-GL-CTS
+popd