From b2a025f9a2c2035f154cb8351c693e65df2b5069 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 18 Jun 2024 09:51:19 +0200 Subject: [PATCH] llvmpipe/ci: set rusticl variables in deqp-runner instead of passing them down from the job Part-of: --- .gitlab-ci/common/generate-env.sh | 2 -- src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-rusticl.toml | 2 ++ src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh index b8c406ff652..e461379f780 100755 --- a/.gitlab-ci/common/generate-env.sh +++ b/.gitlab-ci/common/generate-env.sh @@ -112,8 +112,6 @@ VARS=( RADEON_DEBUG RADV_DEBUG RADV_PERFTEST - RUSTICL_ENABLE - RUSTICL_DEBUG SKQP_ASSETS_DIR SKQP_BACKENDS TU_DEBUG diff --git a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-rusticl.toml b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-rusticl.toml index 75f48f313fd..096bc401caa 100644 --- a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-rusticl.toml +++ b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-rusticl.toml @@ -2,3 +2,5 @@ piglit_folder = "/piglit" profile = "cl" process_isolation = true + [piglit.env] + RUSTICL_ENABLE = "llvmpipe" diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml index 39f3c4c3db0..bd61786c0e3 100644 --- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml +++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml @@ -9,7 +9,6 @@ llvmpipe-piglit-rusticl: - debian-testing - debian/x86_64_test-gl variables: - RUSTICL_ENABLE: "llvmpipe" DEQP_SUITE: llvmpipe-rusticl DEQP_RUNNER_OPTIONS: "--timeout 120.0" GPU_VERSION: llvmpipe-rusticl