diff options
author | Emma Anholt <emma@anholt.net> | 2021-10-11 16:07:23 -0700 |
---|---|---|
committer | Eric Engestrom <eric@engestrom.ch> | 2021-11-10 21:57:57 +0000 |
commit | cacf72666986224e2857b34daf60be3a091a0ecb (patch) | |
tree | b1646425db6ebaaee4dbaa30b82d5ca1e25986ac | |
parent | 61c78021b3058acfae7a7dc0d93cc981967d50eb (diff) |
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>
(cherry picked from commit 899174c210b65e15759ba398f08470464659a786)
-rw-r--r-- | .gitlab-ci.yml | 2 | ||||
-rwxr-xr-x | .gitlab-ci/common/generate-env.sh | 1 | ||||
-rwxr-xr-x | .gitlab-ci/deqp-runner.sh | 3 | ||||
-rwxr-xr-x | .gitlab-ci/piglit/piglit-runner.sh | 4 | ||||
-rw-r--r-- | .pick_status.json | 2 | ||||
-rw-r--r-- | src/gallium/drivers/softpipe/ci/gitlab-ci.yml | 2 | ||||
-rw-r--r-- | src/gallium/frontends/lavapipe/ci/gitlab-ci.yml | 2 |
7 files changed, 4 insertions, 12 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f4e6ad6e7f..528fa211278 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh index 83b15247e02..db457783396 100755 --- a/.gitlab-ci/common/generate-env.sh +++ b/.gitlab-ci/common/generate-env.sh @@ -74,7 +74,6 @@ for var in \ PIGLIT_RESULTS \ PIGLIT_TESTS \ PIPELINE_ARTIFACTS_BASE \ - TEST_LD_PRELOAD \ TU_DEBUG \ VK_CPU \ VK_DRIVER \ diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index 18cddc03489..d31a1271c3e 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -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 diff --git a/.gitlab-ci/piglit/piglit-runner.sh b/.gitlab-ci/piglit/piglit-runner.sh index 3d12363e831..33ad309a4e0 100755 --- a/.gitlab-ci/piglit/piglit-runner.sh +++ b/.gitlab-ci/piglit/piglit-runner.sh @@ -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 \ diff --git a/.pick_status.json b/.pick_status.json index 7d1949d4171..6485d5a934a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -5413,7 +5413,7 @@ "description": "ci/deqp-runner: Move remaining asan runs to --env LD_PRELOAD=", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/softpipe/ci/gitlab-ci.yml b/src/gallium/drivers/softpipe/ci/gitlab-ci.yml index 2ce2dcd660f..11531ffdb6b 100644 --- a/src/gallium/drivers/softpipe/ci/gitlab-ci.yml +++ b/src/gallium/drivers/softpipe/ci/gitlab-ci.yml @@ -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 diff --git a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml index 4dad2d6c4b3..8a243cb4223 100644 --- a/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml +++ b/src/gallium/frontends/lavapipe/ci/gitlab-ci.yml @@ -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" |