OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Eric Anholt
2021-05-03 10:51:44 -07:00
committed by Marge Bot
parent d246c31ec1
commit d9e64cb2d7
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/deqp-runner.sh
View File

@@ -210,7 +210,7 @@ check_vk_device_name() {
export LD_PRELOAD= export LD_PRELOAD=
DEVICENAME=`grep deviceName $RESULTS/deqp-info.qpa | sed 's|deviceName: ||g'` DEVICENAME=`grep deviceName $RESULTS/deqp-info.qpa | sed 's|deviceName: ||g'`
echo "deviceName: $DEVICENAME" 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" echo "Expected deviceName $DEQP_EXPECTED_RENDERER"
exit 1 exit 1
fi fi

2
src/gallium/frontends/lavapipe/ci/gitlab-ci.yml
View File

@@ -8,6 +8,7 @@ lavapipe-vk:
GPU_VERSION: lvp GPU_VERSION: lvp
VK_DRIVER: lvp VK_DRIVER: lvp
DEQP_FRACTION: 10 DEQP_FRACTION: 10
DEQP_EXPECTED_RENDERER: llvmpipe
lavapipe-nir-stress: lavapipe-nir-stress:
stage: software-renderer stage: software-renderer
@@ -19,5 +20,6 @@ lavapipe-nir-stress:
GPU_VERSION: lvp GPU_VERSION: lvp
VK_DRIVER: lvp VK_DRIVER: lvp
DEQP_FRACTION: 100 DEQP_FRACTION: 100
DEQP_EXPECTED_RENDERER: llvmpipe
NIR_TEST_CLONE: "true" NIR_TEST_CLONE: "true"
NIR_TEST_SERIALIZE: "true" NIR_TEST_SERIALIZE: "true"