diff options
| author | David Heidelberg <david.heidelberg@collabora.com> | 2023-04-16 01:49:40 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-04-16 17:28:52 +0000 |
| commit | 74e423591623a1fabe4060f26b7c251e07b371b3 (patch) | |
| tree | a17683b8ecda1cbac7c5d6549abb09dcf3f6d111 /.gitlab-ci | |
| parent | 2933976e78b395f8abe9f2812223c106b9edc9c8 (diff) | |
| download | mesa-74e423591623a1fabe4060f26b7c251e07b371b3.tar.gz | |
ci: polish deqp-runner a bit
Plus cosmetics adjustments to pass more of shellcheck.
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22255>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/deqp-runner.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index 19d0bc51d21..29a0b56c2dc 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -1,27 +1,27 @@ -#!/bin/bash +#!/usr/bin/env bash section_start test_setup "deqp: preparing test setup" set -ex # Needed so configuration files can contain paths to files in /install -ln -sf $CI_PROJECT_DIR/install /install +ln -sf "$CI_PROJECT_DIR"/install /install if [ -z "$GPU_VERSION" ]; then echo 'GPU_VERSION must be set to something like "llvmpipe" or "freedreno-a630" (the name used in .gitlab-ci/gpu-version-*.txt)' exit 1 fi -INSTALL=`pwd`/install +INSTALL=$(realpath -s "$PWD"/install) # Set up the driver environment. -export LD_LIBRARY_PATH=`pwd`/install/lib/ +export LD_LIBRARY_PATH="$INSTALL"/lib/ export EGL_PLATFORM=surfaceless -export VK_ICD_FILENAMES=`pwd`/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.${VK_CPU:-`uname -m`}.json -export OCL_ICD_VENDORS=`pwd`/install/etc/OpenCL/vendors/ +export VK_ICD_FILENAMES="$PWD"/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.${VK_CPU:-$(uname -m)}.json +export OCL_ICD_VENDORS="$PWD"/install/etc/OpenCL/vendors/ -RESULTS=`pwd`/${DEQP_RESULTS_DIR:-results} -mkdir -p $RESULTS +RESULTS="$PWD/${DEQP_RESULTS_DIR:-results}" +mkdir -p "$RESULTS" # Ensure Mesa Shader Cache resides on tmpfs. SHADER_CACHE_HOME=${XDG_CACHE_HOME:-${HOME}/.cache} |