ci: Allow ANGLE_TAG to be unset in -runner scripts
The android-runner scripts use `set -u`, which causes them to fail if ANGLE_TAG is not defined. This issue went unnoticed because all current Android jobs set ANGLE_TAG. Update all -runner scripts to tolerate ANGLE_TAG being unset. Signed-off-by: Valentine Burley <valentine.burley@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35362>
This commit is contained in:
committed by
Marge Bot
parent
c99c67c490
commit
9a52a25a9e
@@ -42,7 +42,7 @@ if [ -e "$INSTALL/$GPU_VERSION-skips.txt" ]; then
|
||||
DEQP_SKIPS="$DEQP_SKIPS /data/deqp/$GPU_VERSION-skips.txt"
|
||||
fi
|
||||
|
||||
if [ -n "$ANGLE_TAG" ]; then
|
||||
if [ -n "${ANGLE_TAG:-}" ]; then
|
||||
DEQP_SKIPS="$DEQP_SKIPS /data/deqp/angle-skips.txt"
|
||||
fi
|
||||
|
||||
|
||||
@@ -114,7 +114,7 @@ GLES_RUNTIME_VERSION="$(get_gles_runtime_version)"
|
||||
get_vk_runtime_device_name
|
||||
VK_RUNTIME_VERSION="$(get_vk_runtime_version)"
|
||||
|
||||
if [ -n "$ANGLE_TAG" ]; then
|
||||
if [ -n "${ANGLE_TAG:-}" ]; then
|
||||
# Note: we are injecting the ANGLE libs too, so we need to check if the
|
||||
# new ANGLE libs are being used.
|
||||
ANGLE_HASH=$(head -c 12 /angle/version)
|
||||
|
||||
@@ -9,7 +9,7 @@ set -uex
|
||||
section_start cuttlefish_setup "cuttlefish: setup"
|
||||
|
||||
# Structured tagging check for angle
|
||||
if [ -n "$ANGLE_TAG" ]; then
|
||||
if [ -n "${ANGLE_TAG:-}" ]; then
|
||||
# Bail out if the ANGLE_TAG differs from what is offered in the system
|
||||
ci_tag_test_time_check "ANGLE_TAG"
|
||||
fi
|
||||
|
||||
@@ -25,8 +25,8 @@ ARCH=$(uname -m)
|
||||
export VK_DRIVER_FILES="$PWD"/install/share/vulkan/icd.d/"$VK_DRIVER"_icd."$ARCH".json
|
||||
export OCL_ICD_VENDORS="$PWD"/install/etc/OpenCL/vendors/
|
||||
|
||||
if [ -n "$ANGLE_TAG" ]; then
|
||||
# Are we using the right angle version?
|
||||
if [ -n "${ANGLE_TAG:-}" ]; then
|
||||
# Are we using the right ANGLE version?
|
||||
ci_tag_test_time_check "ANGLE_TAG"
|
||||
export LD_LIBRARY_PATH=/angle:$LD_LIBRARY_PATH
|
||||
fi
|
||||
@@ -79,7 +79,7 @@ if [ -e "$INSTALL/$GPU_VERSION-slow-skips.txt" ] && [[ $CI_JOB_NAME != *full* ]]
|
||||
DEQP_SKIPS="$DEQP_SKIPS $INSTALL/$GPU_VERSION-slow-skips.txt"
|
||||
fi
|
||||
|
||||
if [ -n "$ANGLE_TAG" ]; then
|
||||
if [ -n "${ANGLE_TAG:-}" ]; then
|
||||
DEQP_SKIPS="$DEQP_SKIPS $INSTALL/angle-skips.txt"
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user