From e912bef85d4d5a47b474a66555200cbee094f865 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Thu, 16 Mar 2023 11:42:12 +0100
Subject: test: wrap mkfs.*/mksquashfs/mkswap binaries when running w/ ASan

---
 test/test-functions | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/test-functions b/test/test-functions
index 252aea57a1..820cb93e95 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -2638,12 +2638,14 @@ inst_binary() {
 
     # Same as above, but we need to wrap certain libraries unconditionally
     #
-    # chown, getent, login, su, useradd, userdel - dlopen()s (not only) systemd's PAM modules
-    # ls, stat - pulls in nss_systemd with certain options (like ls -l) when
-    #            nsswitch.conf uses [SUCCESS=merge] (like on Arch Linux)
-    # delv, dig - pulls in nss_resolve if `resolve` is in nsswitch.conf
+    # chown, getent, login, su, useradd, userdel - dlopen() (not only) systemd's PAM modules
+    # ls, mkfs.*, mksquashfs, mkswap, stat
+    #       - pull in nss_systemd with certain options (like ls -l) when
+    #         nsswitch.conf uses [SUCCESS=merge] (like on Arch Linux)
+    # delv, dig - pull in nss_resolve if `resolve` is in nsswitch.conf
     # tar - called by machinectl in TEST-25
-    if get_bool "$IS_BUILT_WITH_ASAN" && [[ "$bin" =~ /(chown|delv|dig|getent|login|ls|stat|su|tar|useradd|userdel)$ ]]; then
+    bin_rx='/(chown|delv|dig|getent|login|ls|mkfs\.[a-z0-9]+|mksquashfs|mkswap|stat|su|tar|useradd|userdel)$'
+    if get_bool "$IS_BUILT_WITH_ASAN" && [[ "$bin" =~ $bin_rx ]]; then
         wrap_binary=1
     fi
 
-- 
cgit v1.2.1