From eece545d792061694ca3b0ef84bdb572f030ef1a Mon Sep 17 00:00:00 2001 From: Guilherme Gallo Date: Tue, 2 Aug 2022 17:35:56 -0300 Subject: [PATCH] ci/skqp: Supress irrelevant shellcheck warnings To fix some warnings, one should write a much complex bash code, such as SC2086, so prefer to be simple and functional. Signed-off-by: Guilherme Gallo Part-of: --- .gitlab-ci/skqp-runner.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/skqp-runner.sh b/.gitlab-ci/skqp-runner.sh index 6057b33481c..8c9a32eb2cb 100755 --- a/.gitlab-ci/skqp-runner.sh +++ b/.gitlab-ci/skqp-runner.sh @@ -86,6 +86,7 @@ merge_rendertests_files() { BASE_FILE=$1 shift FILES="$*" + # shellcheck disable=SC2086 cat $FILES "$BASE_FILE" | sort --unique --stable --field-separator=, --key=1,1 | sponge "$BASE_FILE" @@ -199,13 +200,14 @@ resolve_tests_files() { } test_vk_backend() { - if echo "${SKQP_BACKENDS}" | grep -qE 'vk' + if echo "${SKQP_BACKENDS:?}" | grep -qE 'vk' then if [ -n "$VK_DRIVER" ]; then return 0 fi echo "VK_DRIVER environment variable is missing." + # shellcheck disable=SC2012 VK_DRIVERS=$(ls "$INSTALL"/share/vulkan/icd.d/ | cut -f 1 -d '_') if [ -n "${VK_DRIVERS}" ] then @@ -244,6 +246,7 @@ show_reports() ( find "${SKQP_RESULTS_DIR}"/**/report.html -type f > "${REPORT_FILES}" while read -r REPORT do + # shellcheck disable=SC2001 BACKEND_NAME=$(echo "${REPORT}" | sed 's@.*/\([^/]*\)/report.html@\1@') echo "See skqp ${BACKEND_NAME} render tests report at:" echo "https://$CI_PROJECT_ROOT_NAMESPACE.pages.freedesktop.org/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts${REPORT}"