From 2d1c60700528e17ca5693ff3943d7662577b3d26 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 13 Aug 2020 15:10:18 -0700 Subject: [PATCH] ci: Make a missing device name correctly bail out of deqp-runner.sh. If your driver is totally broken and can't even report its name, let's stop here instead of doing a CTS run full of failure to start tests and reporting them all missing at the end. Reviewed-by: Alyssa Rosenzweig Part-of: --- .gitlab-ci/deqp-runner.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index c81229d530d..8d9995ed0a3 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -238,7 +238,7 @@ check_vk_device_name() { $DEQP $DEQP_OPTIONS --deqp-case=dEQP-VK.info.device --deqp-log-filename=$RESULTS/deqp-info.qpa DEVICENAME=`grep deviceName $RESULTS/deqp-info.qpa | sed 's|deviceName: ||g'` echo "deviceName: $DEVICENAME" - if [ -n "$DEQP_EXPECTED_RENDERER" -a $DEVICENAME != "$DEQP_EXPECTED_RENDERER" ]; then + if [ -n "$DEQP_EXPECTED_RENDERER" -a "x$DEVICENAME" != "x$DEQP_EXPECTED_RENDERER" ]; then echo "Expected deviceName $DEQP_EXPECTED_RENDERER" exit 1 fi