Merging upstream version 1.5.

Signed-off-by: Daniel Baumann <daniel@debian.org>

test/meson.build

@@ -65,3 +65,23 @@ uuid = executable(
 )
 
 test('uuid', uuid)
+
+if conf.get('HAVE_NETDB')
+    tree = executable(
+        'tree',
+        ['tree.c'],
+        dependencies: libnvme_dep,
+        include_directories: [incdir, internal_incdir]
+    )
+
+    test('tree', tree)
+
+    test_util = executable(
+        'test-util',
+        ['test-util.c'],
+        include_directories: [incdir, internal_incdir]
+    )
+    test('Test util.c', test_util)
+endif
+
+subdir('nbft')