mkosi: extend DefaultTimeoutStopSec= when running on sanitizers

Hopefully fixes #35335.
2025-03-01 08:58:29 +03:00 · 2024-11-30 04:06:24 +09:00 · 2024-11-30 04:06:24 +09:00 · b75befc3c9
commit b75befc3c9
parent 3f3b4959e2
2 changed files with 6 additions and 2 deletions
--- 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
@ -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
--- 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',
        },
 ]