mkosi: extend DefaultTimeoutStopSec= when running on sanitizers

Hopefully fixes #35335.

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 (file)
index 0000000..28dbdb2
--- /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 e5b9f19015167f73e757ca20c7c4aafec7b4facb..4f50d66e550481010d7e8d5185c17224543b0a81 100644 (file)
--- 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',
         },
 ]