From b75befc3c98bcfa57ab801a24234ecab1c0b34a9 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 30 Nov 2024 04:06:24 +0900 Subject: [PATCH] mkosi: extend DefaultTimeoutStopSec= when running on sanitizers Hopefully fixes #35335. --- .../etc/systemd/system.conf.d/10-default-timeout.conf | 6 ++++++ test/TEST-73-LOCALE/meson.build | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 mkosi.sanitizers/mkosi.extra/etc/systemd/system.conf.d/10-default-timeout.conf diff --git a/mkosi.sanitizers/mkosi.extra/etc/systemd/system.conf.d/10-default-timeout.conf b/mkosi.sanitizers/mkosi.extra/etc/systemd/system.conf.d/10-default-timeout.conf new file mode 100644 index 00000000000..28dbdb29a26 --- /dev/null +++ b/mkosi.sanitizers/mkosi.extra/etc/systemd/system.conf.d/10-default-timeout.conf @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Manager] +# Sanitizers may make exit() extremely slower. +# Let's extend the timeout. See issue #35335. +DefaultTimeoutStopSec=2min diff --git a/test/TEST-73-LOCALE/meson.build b/test/TEST-73-LOCALE/meson.build index e5b9f190151..4f50d66e550 100644 --- a/test/TEST-73-LOCALE/meson.build +++ b/test/TEST-73-LOCALE/meson.build @@ -4,7 +4,5 @@ integration_tests += [ integration_test_template + { 'name' : fs.name(meson.current_source_dir()), 'priority' : 10, - # TODO: Remove when https://github.com/systemd/systemd/issues/35335 is fixed. - 'coredump-exclude-regex' : '/systemd-localed', }, ] -- 2.47.3