mirror of
https://gitlab.freedesktop.org/wayland/weston
synced 2024-09-30 05:31:54 +00:00
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 <daniels@collabora.com>
This commit is contained in:
parent
249f68adb0
commit
68fd41a719
|
@ -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:
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
export LSAN_OPTIONS="suppressions=../.gitlab-ci/leak-sanitizer.supp"
|
||||
export ASAN_OPTIONS="detect_leaks=1"
|
||||
|
||||
exec "$@"
|
|
@ -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=$?
|
||||
|
|
Loading…
Reference in a new issue