From 68fd41a719ef1aa1475361c02369e9425c04e201 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Wed, 21 Jun 2023 13:53:45 +0100 Subject: [PATCH] CI: Remove per-test-asan wrapper Now that we've concluded the Xwayland/fontconfig stuff, we don't actually need a per-test wrapper; we can just set the options globally. It turns out that we don't need to set the options at all anyway, since the previous commit adds the LSan suppressions to all test runs, and LSan is enabled by default, so we can just bin it. Signed-off-by: Daniel Stone --- .gitlab-ci.yml | 2 +- .gitlab-ci/virtme-scripts/per-test-asan.sh | 6 ------ .gitlab-ci/virtme-scripts/run-weston-tests.sh | 3 +-- 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100755 .gitlab-ci/virtme-scripts/per-test-asan.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4ebeeca07..af787e842 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -263,7 +263,7 @@ aarch64-debian-container_prep: - $BUILDDIR/weston-virtme - $PREFIX reports: - junit: $BUILDDIR/meson-logs/testlog-per-test-asan.sh.junit.xml + junit: $BUILDDIR/meson-logs/testlog-junit.xml # Same as above, but without running any tests. .build-no-test: diff --git a/.gitlab-ci/virtme-scripts/per-test-asan.sh b/.gitlab-ci/virtme-scripts/per-test-asan.sh deleted file mode 100755 index a669d4eee..000000000 --- a/.gitlab-ci/virtme-scripts/per-test-asan.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -export LSAN_OPTIONS="suppressions=../.gitlab-ci/leak-sanitizer.supp" -export ASAN_OPTIONS="detect_leaks=1" - -exec "$@" diff --git a/.gitlab-ci/virtme-scripts/run-weston-tests.sh b/.gitlab-ci/virtme-scripts/run-weston-tests.sh index c61bd6159..33a936b15 100755 --- a/.gitlab-ci/virtme-scripts/run-weston-tests.sh +++ b/.gitlab-ci/virtme-scripts/run-weston-tests.sh @@ -35,8 +35,7 @@ export WESTON_CI_LEAK_DL_HANDLE=$(find /usr/local -name swrast_dri.so -print 2>/ # run the tests and save the exit status # we give ourselves a very generous timeout multiplier due to ASan overhead echo 0x1f > /sys/module/drm/parameters/debug -seatd-launch -- meson test --no-rebuild --timeout-multiplier 4 \ - --wrapper $(pwd)/../.gitlab-ci/virtme-scripts/per-test-asan.sh +seatd-launch -- meson test --no-rebuild --timeout-multiplier 4 # note that we need to store the return value from the tests in order to # determine if the test suite ran successfully or not. TEST_RES=$?