diff options
| author | Rob Clark <robdclark@chromium.org> | 2020-08-31 09:04:24 -0700 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-09-29 19:58:50 +0000 |
| commit | aee1c08c06567a7c83f97f3e736dec4bb0008403 (patch) | |
| tree | bafc7989ffa3c967e78029889879c3c8df368f51 /.gitlab-ci | |
| parent | efaea653b5766427701817ab06c319902a148ee9 (diff) | |
ci/deqp-runner: Allow overriding width/height/config
This will allow adding multi-sample caselists, and jobs with larger
surface size.
Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6553>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/bare-metal/rootfs-setup.sh | 4 | ||||
| -rwxr-xr-x | .gitlab-ci/deqp-runner.sh | 15 |
2 files changed, 14 insertions, 5 deletions
diff --git a/.gitlab-ci/bare-metal/rootfs-setup.sh b/.gitlab-ci/bare-metal/rootfs-setup.sh index 224c31fc89e..576faf0759f 100644 --- a/.gitlab-ci/bare-metal/rootfs-setup.sh +++ b/.gitlab-ci/bare-metal/rootfs-setup.sh @@ -28,14 +28,18 @@ for var in \ CI_PROJECT_PATH \ CI_RUNNER_DESCRIPTION \ DEQP_CASELIST_FILTER \ + DEQP_CONFIG \ DEQP_EXPECTED_FAILS \ DEQP_EXPECTED_RENDERER \ + DEQP_HEIGHT \ DEQP_NO_SAVE_RESULTS \ DEQP_FLAKES \ DEQP_PARALLEL \ DEQP_RUN_SUFFIX \ DEQP_SKIPS \ + DEQP_VARIANT \ DEQP_VER \ + DEQP_WIDTH \ DEVICE_NAME \ DRIVER_NAME \ FD_MESA_DEBUG \ diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index 8d9995ed0a3..a4ec079a074 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -2,9 +2,14 @@ set -ex -DEQP_OPTIONS="$DEQP_OPTIONS --deqp-surface-width=256 --deqp-surface-height=256" +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=pbuffer" -DEQP_OPTIONS="$DEQP_OPTIONS --deqp-gl-config-name=rgba8888d24s8ms0" +DEQP_OPTIONS="$DEQP_OPTIONS --deqp-gl-config-name=$DEQP_CONFIG" DEQP_OPTIONS="$DEQP_OPTIONS --deqp-visibility=hidden" # deqp's shader cache (for vulkan) is not multiprocess safe for a common @@ -45,14 +50,14 @@ mkdir -p $RESULTS # Generate test case list file. if [ "$DEQP_VER" = "vk" ]; then - cp /deqp/mustpass/vk-master.txt /tmp/case-list.txt + cp /deqp/mustpass/vk-$DEQP_VARIANT.txt /tmp/case-list.txt DEQP=/deqp/external/vulkancts/modules/vulkan/deqp-vk elif [ "$DEQP_VER" = "gles2" -o "$DEQP_VER" = "gles3" -o "$DEQP_VER" = "gles31" ]; then - cp /deqp/mustpass/$DEQP_VER-master.txt /tmp/case-list.txt + cp /deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt /tmp/case-list.txt DEQP=/deqp/modules/$DEQP_VER/deqp-$DEQP_VER SUITE=dEQP else - cp /deqp/mustpass/$DEQP_VER-master.txt /tmp/case-list.txt + cp /deqp/mustpass/$DEQP_VER-$DEQP_VARIANT.txt /tmp/case-list.txt DEQP=/deqp/external/openglcts/modules/glcts SUITE=KHR fi |