diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index d7102035bb2..195c8c3a2c5 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -433,6 +433,19 @@ debian-arm32: - .gitlab-ci/meson/build.sh - .gitlab-ci/prepare-artifacts.sh +debian-arm32-asan: + extends: + - debian-arm32 + variables: + EXTRA_OPTION: > + -D llvm=disabled + -D b_sanitize=address + -D valgrind=disabled + -D tools=dlclose-skip + ARTIFACTS_DEBUG_SYMBOLS: 1 + MINIO_ARTIFACT_NAME: mesa-arm32-asan + MESON_TEST_ARGS: "--no-suite mesa:compiler --no-suite mesa:util" + debian-arm64: extends: - .meson-arm diff --git a/.gitlab-ci/container/cross_build.sh b/.gitlab-ci/container/cross_build.sh index ab67da01034..6fee1ff5af6 100644 --- a/.gitlab-ci/container/cross_build.sh +++ b/.gitlab-ci/container/cross_build.sh @@ -18,6 +18,7 @@ apt-get install -y --no-remove \ $STABLE_EPHEMERAL \ crossbuild-essential-$arch \ pkgconf:$arch \ + libasan8:$arch \ libdrm-dev:$arch \ libelf-dev:$arch \ libexpat1-dev:$arch \ diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 0e91c04b73b..6846477576f 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -1,6 +1,6 @@ variables: DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" - DEBIAN_BASE_TAG: "2023-06-08-rust-clippy" + DEBIAN_BASE_TAG: "2023-06-08-asan-arm32" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" DEBIAN_BUILD_TAG: "2023-05-25-bookworm" diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index 3c186d0067f..d26aa60a621 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -210,7 +210,19 @@ clang-format: - job: debian-arm64 artifacts: false -# ARM64 testing of bare-metal boards attached to an x86 gitlab-runner system, using an asan mesa build +# ARM32/64 testing of bare-metal boards attached to an x86 gitlab-runner system, using an asan mesa build +.baremetal-arm32-asan-test: + extends: + - .baremetal-test + - .use-debian/arm32_test + variables: + DEQP_RUNNER_OPTIONS: "--env LD_PRELOAD=libasan.so.8:/install/lib/libdlclose-skip.so" + MINIO_ARTIFACT_NAME: mesa-arm32-asan + needs: + - debian/arm32_test + - job: debian-arm32-asan + artifacts: false + .baremetal-arm64-asan-test: extends: - .baremetal-test