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@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10438>

.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

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"