From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Fri, 31 Jan 2020 06:13:14 +0000 (+0000)
Subject: tests: unset LD_PRELOAD in testsuite.service when it's run under ASan
X-Git-Tag: v245-rc1~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a1862bfa6cdd1352101b232a24f039b88ef4cee;p=thirdparty%2Fsystemd.git

tests: unset LD_PRELOAD in testsuite.service when it's run under ASan

This should help to address the "grep" issue we ran into in
https://github.com/systemd/systemd-centos-ci/pull/217.
---

diff --git a/test/test-functions b/test/test-functions
index 5fffa5b9f86..372b0394088 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -469,9 +469,14 @@ printf "[Service]\nTimeoutSec=180s\n" >/etc/systemd/system/systemd-journal-flush
 # 1
 # Let's workaround this by clearing the previously set LD_PRELOAD env variable,
 # so the libasan library is not loaded for this particular service
-REMOUNTFS_CONF_DIR=/etc/systemd/system/systemd-remount-fs.service.d
-mkdir -p "\$REMOUNTFS_CONF_DIR"
-printf "[Service]\nUnsetEnvironment=LD_PRELOAD\n" >"\$REMOUNTFS_CONF_DIR/env.conf"
+unset_ld_preload() {
+    local _dropin_dir="/etc/systemd/system/\$1.service.d"
+    mkdir -p "\$_dropin_dir"
+    printf "[Service]\nUnsetEnvironment=LD_PRELOAD\n" >"\$_dropin_dir/unset_ld_preload.conf"
+}
+
+unset_ld_preload systemd-remount-fs
+unset_ld_preload testsuite
 
 export ASAN_OPTIONS=\$DEFAULT_ASAN_OPTIONS:log_path=/systemd.asan.log UBSAN_OPTIONS=\$DEFAULT_UBSAN_OPTIONS
 exec  $ROOTLIBDIR/systemd "\$@"