From 4bcaeab4dc14c357afc152559b273b5b8b59100f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 5 Jun 2023 21:47:36 -0400 Subject: [PATCH 1/2] ci: More asan test runs --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 351bd0fb65..bcd2f7eaf3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -391,6 +391,8 @@ asan-build: - CC=clang meson setup --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled -Df16c=disabled _build - ninja -C _build - .gitlab-ci/run-tests.sh _build wayland + - .gitlab-ci/run-tests.sh _build wayland_gles + - .gitlab-ci/run-tests.sh _build x11 artifacts: paths: - _build/meson-logs From 2c67d9f7cffc001fdfc303e44ec9bfcbc41dc719 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 5 Jun 2023 22:05:16 -0400 Subject: [PATCH 2/2] ci: Build less for asan The asan build is all about running the tests with asan, so lets not waste time building demos and examples. --- .gitlab-ci.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bcd2f7eaf3..f8d7f2417a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -222,7 +222,7 @@ macos: -Dcpp_std=c++11 -Dpixman:tests=disabled -Dlibjpeg-turbo:simd=disabled - -Ddemos=false + -Dbuild-demos=false -Dbuild-tests=false -Dbuild-examples=false -Dbuild-testsuite=false @@ -388,7 +388,16 @@ asan-build: variables: script: - export PATH="$HOME/.local/bin:$PATH" - - CC=clang meson setup --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled -Df16c=disabled _build + - CC=clang meson setup + --buildtype=debugoptimized + -Db_sanitize=address + -Db_lundef=false + -Dbuild-demos=false + -Dbuild-tests=false + -Dbuild-examples=false + -Dintrospection=disabled + -Df16c=disabled + _build - ninja -C _build - .gitlab-ci/run-tests.sh _build wayland - .gitlab-ci/run-tests.sh _build wayland_gles