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

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

Browse Source 
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>
This commit is contained in:
Emma Anholt
2022-03-10 12:56:17 -08:00
committed by Marge Bot
parent 82cd8614e6
commit 34278e8f2e
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,8 +123,6 @@ if [ -e "$INSTALL/$GPU_VERSION-skips.txt" ]; then
DEQP_SKIPS="$DEQP_SKIPS $INSTALL/$GPU_VERSION-skips.txt" DEQP_SKIPS="$DEQP_SKIPS $INSTALL/$GPU_VERSION-skips.txt"
fi fi
set +e
report_load() { report_load() {
echo "System load: $(cut -d' ' -f1-3 < /proc/loadavg)" echo "System load: $(cut -d' ' -f1-3 < /proc/loadavg)"
echo "# of CPU cores: $(cat /proc/cpuinfo | grep processor | wc -l)" 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" echo -e "\e[0Ksection_start:$(date +%s):deqp[collapsed=false]\r\e[0Kdeqp-runner"
set -x set -x
set +e
if [ -z "$DEQP_SUITE" ]; then if [ -z "$DEQP_SUITE" ]; then
deqp-runner \ deqp-runner \
run \ run \