Mesa (main): ci/deqp: Make DEQP_EXPECTED_RENDERER a required regex for VK like for GLES.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: d9e64cb2d72d4c8624b596ea6db4042456890daa
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d9e64cb2d72d4c8624b596ea6db4042456890daa

Author: Eric Anholt <eric at anholt.net>
Date:   Mon May  3 10:51:44 2021 -0700

ci/deqp: Make DEQP_EXPECTED_RENDERER a required regex for VK like for GLES.

All devices want it, and regexes are nicer for handling more complicated
device names.

Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10438>

---

 .gitlab-ci/deqp-runner.sh                       | 2 +-
 src/gallium/frontends/lavapipe/ci/gitlab-ci.yml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index 2855e2b8bc5..8fc64f20827 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -210,7 +210,7 @@ check_vk_device_name() {
     export LD_PRELOAD=
     DEVICENAME=`grep deviceName $RESULTS/deqp-info.qpa | sed 's|deviceName: ||g'`
     echo "deviceName: $DEVICENAME"
-    if [ -n "$DEQP_EXPECTED_RENDERER" -a "x$DEVICENAME" != "x$DEQP_EXPECTED_RENDERER" ]; then
+    if ! echo $DEVICENAME | grep -q "$DEQP_EXPECTED_RENDERER"; then
         echo "Expected deviceName $DEQP_EXPECTED_RENDERER"
         exit 1
     fi
diff --git a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
index 32d47a1e8c0..77920b2cbe2 100644
--- a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
+++ b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
@@ -8,6 +8,7 @@ lavapipe-vk:
     GPU_VERSION: lvp
     VK_DRIVER: lvp
     DEQP_FRACTION: 10
+    DEQP_EXPECTED_RENDERER: llvmpipe
 
 lavapipe-nir-stress:
   stage: software-renderer
@@ -19,5 +20,6 @@ lavapipe-nir-stress:
     GPU_VERSION: lvp
     VK_DRIVER: lvp
     DEQP_FRACTION: 100
+    DEQP_EXPECTED_RENDERER: llvmpipe
     NIR_TEST_CLONE: "true"
     NIR_TEST_SERIALIZE: "true"