From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 29 Nov 2024 19:06:24 +0000 (+0900)
Subject: mkosi: extend DefaultTimeoutStopSec= when running on sanitizers
X-Git-Tag: v257~55^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b75befc3c98bcfa57ab801a24234ecab1c0b34a9;p=thirdparty%2Fsystemd.git

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
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',
         },
 ]