ci/deqp-runner: Move remaining asan runs to --env LD_PRELOAD=

This should improve their reliability and speed a little by getting
deqp-runner off of asan.  This removes the last jobs setting
TEST_LD_PRELOAD, so remove passing that variable around from other
scripts.

Acked-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>
This commit is contained in:
Emma Anholt 2021-10-11 16:07:23 -07:00 committed by Marge Bot
parent 37c690ad1a
commit 899174c210
6 changed files with 3 additions and 11 deletions

View File

@ -1337,7 +1337,7 @@ debian-mingw32-x86_64:
.baremetal-arm64-asan-test:
variables:
TEST_LD_PRELOAD: libasan.so.6
DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.6"
MINIO_ARTIFACT_NAME: mesa-arm64-asan
needs:
- debian/arm_test

View File

@ -74,7 +74,6 @@ for var in \
PIGLIT_RESULTS \
PIGLIT_TESTS \
PIPELINE_ARTIFACTS_BASE \
TEST_LD_PRELOAD \
TU_DEBUG \
VK_CPU \
VK_DRIVER \

View File

@ -145,8 +145,6 @@ if [ "$GALLIUM_DRIVER" = "virpipe" ]; then
sleep 1
fi
export LD_PRELOAD=$TEST_LD_PRELOAD
if [ -z "$DEQP_SUITE" ]; then
if [ -n "$DEQP_EXPECTED_RENDERER" ]; then
export DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --renderer-check "$DEQP_EXPECTED_RENDERER""
@ -183,7 +181,6 @@ fi
DEQP_EXITCODE=$?
export LD_PRELOAD=
quiet report_load
# Remove all but the first 50 individual XML files uploaded as artifacts, to

View File

@ -53,8 +53,6 @@ fi
set +e
export LD_PRELOAD=$TEST_LD_PRELOAD
piglit-runner \
run \
--piglit-folder /piglit \
@ -69,8 +67,6 @@ export LD_PRELOAD=$TEST_LD_PRELOAD
PIGLIT_EXITCODE=$?
export LD_PRELOAD=
deqp-runner junit \
--testsuite $PIGLIT_PROFILES \
--results $RESULTS/failures.csv \

View File

@ -22,7 +22,7 @@ softpipe-asan-gles31:
GPU_VERSION: softpipe-asan
DEQP_FRACTION: 10
DEQP_VER: gles31
TEST_LD_PRELOAD: libasan.so.6
DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.6"
extends: .softpipe-deqp-test
needs:
- debian/x86_test-gl

View File

@ -30,7 +30,7 @@ lavapipe-vk-asan:
variables:
GPU_VERSION: lvp-asan
DEQP_FRACTION: 50
TEST_LD_PRELOAD: libasan.so.6
DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.6"
# Disable the leak checks, since the library gets dlclose()d and thus get
# totally useless leak reports. We can still catch buffer overflows.
ASAN_OPTIONS: "detect_leaks=0"