From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 4 Dec 2024 00:13:18 +0000 (+0900)
Subject: Revert "mkosi: extend DefaultTimeoutStopSec= when running on sanitizers"
X-Git-Tag: v257~37^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=552e5db9ac41581d8bd4632b6db8c17d1715243e;p=thirdparty%2Fsystemd.git

Revert "mkosi: extend DefaultTimeoutStopSec= when running on sanitizers"

This reverts commit b75befc3c98bcfa57ab801a24234ecab1c0b34a9.

Unfortunately, it does not work. Let's revert.
---

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
deleted file mode 100644
index 28dbdb29a26..00000000000
--- a/mkosi.sanitizers/mkosi.extra/etc/systemd/system.conf.d/10-default-timeout.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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 4f50d66e550..e5b9f190151 100644
--- a/test/TEST-73-LOCALE/meson.build
+++ b/test/TEST-73-LOCALE/meson.build
@@ -4,5 +4,7 @@ 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',
         },
 ]