1 files changed, 15 insertions, 3 deletions
diff --git a/test/meson.build b/test/meson.build
index 49cd1ac..2b4c6d8 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -67,21 +67,33 @@ uuid = executable(
 test('uuid', uuid)
 
 if conf.get('HAVE_NETDB')
+    mock_ifaddrs = library(
+        'mock-ifaddrs',
+        ['mock-ifaddrs.c', ],
+    )
+
+    # See comment in test/ioctl/meson.build explaining how LD_PRELOAD is used
+    mock_ifaddrs_env = environment()
+    mock_ifaddrs_env.append('LD_PRELOAD', mock_ifaddrs.full_path())
+    mock_ifaddrs_env.set('ASAN_OPTIONS', 'verify_asan_link_order=0')
+
     tree = executable(
         'tree',
         ['tree.c'],
         dependencies: libnvme_dep,
-        include_directories: [incdir, internal_incdir]
+        include_directories: [incdir, internal_incdir],
+        link_with: mock_ifaddrs,
     )
 
-    test('tree', tree)
+    test('tree', tree, env: mock_ifaddrs_env)
 
     test_util = executable(
         'test-util',
         ['test-util.c'],
         include_directories: [incdir, internal_incdir]
     )
-    test('Test util.c', test_util)
+    test('util', test_util)
 endif
 
+subdir('ioctl')
 subdir('nbft')