ci/deqp: Add a DEQP_FORCE_ASAN option

Replace the last use case for for DEQP_RUNNER_OPTIONS by introducing
a centralized option instead of hardcoding the path via the --env
argument in various test configs.

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32659>

.gitlab-ci/common/generate-env.sh

@@ -31,9 +31,9 @@ VARS=(
     CROSVM_GPU_ARGS
     CURRENT_SECTION
     DEQP_BIN_DIR
+    DEQP_FORCE_ASAN
     DEQP_FRACTION
     DEQP_RUNNER_MAX_FAILS
-    DEQP_RUNNER_OPTIONS
     DEQP_SUITE
     DEQP_TEMP_DIR
     DEVICE_NAME

.gitlab-ci/cuttlefish-runner.sh

@@ -104,8 +104,7 @@ $ADB shell "mkdir ${AOSP_RESULTS}; cd ${AOSP_RESULTS}/..; ./deqp-runner \
     --testlog-to-xml /deqp-tools/testlog-to-xml \
     --fraction-start ${CI_NODE_INDEX:-1} \
     --fraction $(( CI_NODE_TOTAL * ${DEQP_FRACTION:-1})) \
-    --jobs ${FDO_CI_CONCURRENT:-4} \
-    $DEQP_RUNNER_OPTIONS"
+    --jobs ${FDO_CI_CONCURRENT:-4}"
 
 EXIT_CODE=$?
 set -e

.gitlab-ci/deqp-runner.sh

@@ -135,7 +135,7 @@ deqp-runner \
     --jobs ${FDO_CI_CONCURRENT:-4} \
     $BASELINE \
     ${DEQP_RUNNER_MAX_FAILS:+--max-fails "$DEQP_RUNNER_MAX_FAILS"} \
-    $DEQP_RUNNER_OPTIONS; DEQP_EXITCODE=$?
+    ${DEQP_FORCE_ASAN:+--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so}; DEQP_EXITCODE=$?
 
 { set +x; } 2>/dev/null
 

.gitlab-ci/test/gitlab-ci.yml

@@ -239,8 +239,8 @@ yaml-toml-shell-py-test:
 # ARM32/64 testing of bare-metal boards attached to an x86 gitlab-runner system, using an asan mesa build
 .baremetal-arm32-asan-test:
   variables:
-    DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so"
     S3_ARTIFACT_NAME: mesa-arm32-asan-debugoptimized
+    DEQP_FORCE_ASAN: 1
   needs:
     - debian/baremetal_arm32_test
     - job: debian-arm32-asan
@@ -249,8 +249,8 @@ yaml-toml-shell-py-test:
 
 .baremetal-arm64-asan-test:
   variables:
-    DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so"
     S3_ARTIFACT_NAME: mesa-arm64-asan-debugoptimized
+    DEQP_FORCE_ASAN: 1
   needs:
     - debian/baremetal_arm64_test
     - job: debian-arm64-asan

src/gallium/drivers/softpipe/ci/gitlab-ci.yml

@@ -18,7 +18,7 @@ softpipe-asan-gles31:
     DEQP_SUITE: softpipe-asan
     GPU_VERSION: softpipe-asan
     DEQP_FRACTION: 10
-    DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8"
+    DEQP_FORCE_ASAN: 1
   extends: .softpipe-deqp-test
   needs:
     - debian/x86_64_test-gl

src/gallium/frontends/lavapipe/ci/gitlab-ci.yml

@@ -29,9 +29,7 @@ lavapipe-full:
   variables:
     DEQP_SUITE: lvp-asan
     GPU_VERSION: lvp-asan
-    # Skip dlclose so that we get good backtraces of the leaks.
-    # Don't batch the tests into caselists while we're leaky.
-    DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8:libdlclose-skip.so"
+    DEQP_FORCE_ASAN: 1
   needs:
     - debian/x86_64_test-vk
     - debian-testing-asan