diff options
| author | Eric Anholt <eric@anholt.net> | 2021-05-03 10:51:44 -0700 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-05-20 03:18:27 +0000 |
| commit | d9e64cb2d72d4c8624b596ea6db4042456890daa (patch) | |
| tree | dcb2395c26449989b7b98041f88bb585db3a7c02 /.gitlab-ci/deqp-runner.sh | |
| parent | d246c31ec1adbedf46d0b82a946f1e5645dbf460 (diff) | |
| download | mesa-d9e64cb2d72d4c8624b596ea6db4042456890daa.tar.gz | |
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>
Diffstat (limited to '.gitlab-ci/deqp-runner.sh')
| -rwxr-xr-x | .gitlab-ci/deqp-runner.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |