From: Emma Anholt <emma@anholt.net>
Date: Thu, 10 Mar 2022 20:56:17 +0000 (-0800)
Subject: ci/deqp: Move the set +e just before the deqp-runner invocation.
X-Git-Tag: upstream/22.3.5~10913
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=34278e8f2ec47df322bf2ef7a9ff753b1223afbb;p=platform%2Fupstream%2Fmesa.git

ci/deqp: Move the set +e just before the deqp-runner invocation.

You don't want to proceed to running deqp-runner if you failed at the
vtest or runner options environment setup.

Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15332>
---

diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index 2df3e1e..a04cbc9 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -123,8 +123,6 @@ if [ -e "$INSTALL/$GPU_VERSION-skips.txt" ]; then
     DEQP_SKIPS="$DEQP_SKIPS $INSTALL/$GPU_VERSION-skips.txt"
 fi
 
-set +e
-
 report_load() {
     echo "System load: $(cut -d' ' -f1-3 < /proc/loadavg)"
     echo "# of CPU cores: $(cat /proc/cpuinfo | grep processor | wc -l)"
@@ -167,6 +165,7 @@ echo -e "\e[0Ksection_end:$(date +%s):test_setup\r\e[0K"
 echo -e "\e[0Ksection_start:$(date +%s):deqp[collapsed=false]\r\e[0Kdeqp-runner"
 set -x
 
+set +e
 if [ -z "$DEQP_SUITE" ]; then
     deqp-runner \
         run \