From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Tue, 3 Jul 2018 19:29:42 +0000 (+0000)
Subject: tests: redirect ASAN reports on journald to a file
X-Git-Tag: v240~1000^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9506%2Fhead;p=thirdparty%2Fsystemd.git

tests: redirect ASAN reports on journald to a file

Otherwise, they will end up in /dev/null.
---

diff --git a/test/test-functions b/test/test-functions
index 951b7e5a898..1b3d75210fa 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -319,6 +319,12 @@ echo DefaultEnvironment=\$DEFAULT_ENVIRONMENT >>/etc/systemd/system.conf
 # ASAN and syscall filters aren't compatible with each other.
 find / -name '*.service' -type f | xargs sed -i 's/^\\(MemoryDeny\\|SystemCall\\)/#\\1/'
 
+# The redirection of ASAN reports to a file prevents them from ending up in /dev/null.
+# But, apparently, sometimes it doesn't work: https://github.com/google/sanitizers/issues/886.
+JOURNALD_CONF_DIR=/etc/systemd/system/systemd-journald.service.d
+mkdir -p "\$JOURNALD_CONF_DIR"
+printf "[Service]\nEnvironment=ASAN_OPTIONS=\$DEFAULT_ASAN_OPTIONS:log_path=/systemd-journald.asan.log\n" >"\$JOURNALD_CONF_DIR/env.conf"
+
 export ASAN_OPTIONS=\$DEFAULT_ASAN_OPTIONS:log_path=/systemd.asan.log
 exec  $ROOTLIBDIR/systemd "\$@"
 EOF