diff options
| author | Emma Anholt <emma@anholt.net> | 2021-10-14 14:05:20 -0700 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2021-11-10 21:57:57 +0000 |
| commit | f7206f1cdea83719077399995324d38d4b84d9fc (patch) | |
| tree | edd8bc39912c74f95fc74ebfe0b1c51667cba10c /.gitlab-ci | |
| parent | 0a246ea9f15a30e8ba18703a208a56b519c06e8f (diff) | |
ci/deqp-runner: Move more non-suite logic under the non-suite 'if'.
Changing these variables won't do anything for you otherwise.
Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>.
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13372>
(cherry picked from commit 440f207a1f21b5c14833e555f5c6a8cdcac6897d)
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/deqp-runner.sh | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index a89ef25060f..983ca54d51f 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -2,28 +2,6 @@ set -ex -DEQP_WIDTH=${DEQP_WIDTH:-256} -DEQP_HEIGHT=${DEQP_HEIGHT:-256} -DEQP_CONFIG=${DEQP_CONFIG:-rgba8888d24s8ms0} -DEQP_VARIANT=${DEQP_VARIANT:-master} - -DEQP_OPTIONS="$DEQP_OPTIONS --deqp-surface-width=$DEQP_WIDTH --deqp-surface-height=$DEQP_HEIGHT" -DEQP_OPTIONS="$DEQP_OPTIONS --deqp-surface-type=${DEQP_SURFACE_TYPE:-pbuffer}" -DEQP_OPTIONS="$DEQP_OPTIONS --deqp-gl-config-name=$DEQP_CONFIG" -DEQP_OPTIONS="$DEQP_OPTIONS --deqp-visibility=hidden" - -if [ -z "$DEQP_VER" -a -z "$DEQP_SUITE" ]; then - echo 'DEQP_SUITE must be set to the name of your deqp-gpu_version.toml, or DEQP_VER must be set to something like "gles2", "gles31-khr" or "vk" for the test run' - exit 1 -fi - -if [ "$DEQP_VER" = "vk" ]; then - if [ -z "$VK_DRIVER" ]; then - echo 'VK_DRIVER must be to something like "radeon" or "intel" for the test run' - exit 1 - fi -fi - if [ -z "$GPU_VERSION" ]; then echo 'GPU_VERSION must be set to something like "llvmpipe" or "freedreno-a630" (the name used in .gitlab-ci/deqp-gpu-version-*.txt)' exit 1 @@ -42,6 +20,26 @@ mkdir -p $RESULTS HANG_DETECTION_CMD="" if [ -z "$DEQP_SUITE" ]; then + if [ -z "$DEQP_VER" ]; then + echo 'DEQP_SUITE must be set to the name of your deqp-gpu_version.toml, or DEQP_VER must be set to something like "gles2", "gles31-khr" or "vk" for the test run' + exit 1 + fi + + DEQP_WIDTH=${DEQP_WIDTH:-256} + DEQP_HEIGHT=${DEQP_HEIGHT:-256} + DEQP_CONFIG=${DEQP_CONFIG:-rgba8888d24s8ms0} + DEQP_VARIANT=${DEQP_VARIANT:-master} + + DEQP_OPTIONS="$DEQP_OPTIONS --deqp-surface-width=$DEQP_WIDTH --deqp-surface-height=$DEQP_HEIGHT" + DEQP_OPTIONS="$DEQP_OPTIONS --deqp-surface-type=${DEQP_SURFACE_TYPE:-pbuffer}" + DEQP_OPTIONS="$DEQP_OPTIONS --deqp-gl-config-name=$DEQP_CONFIG" + DEQP_OPTIONS="$DEQP_OPTIONS --deqp-visibility=hidden" + + if [ "$DEQP_VER" = "vk" -a -z "$VK_DRIVER" ]; then + echo 'VK_DRIVER must be to something like "radeon" or "intel" for the test run' + exit 1 + fi + # Generate test case list file. if [ "$DEQP_VER" = "vk" ]; then MUSTPASS=/deqp/mustpass/vk-$DEQP_VARIANT.txt |