Merging upstream version 1.1~rc0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 29 insertions, 10 deletions

diff --git a/test/meson.build b/test/meson.build
index 193d558..00c9ceb 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -12,28 +12,47 @@
 main = executable(
     'main-test',
     ['test.c'],
-    dependencies: libuuid_dep,
-    link_with: libnvme,
+    dependencies: [libnvme_dep, libuuid_dep],
     include_directories: [incdir, internal_incdir]
 )
 
-cpp = executable(
-    'test-cpp',
-    ['cpp.cc'],
-    link_with: libnvme,
-    include_directories: [incdir, internal_incdir]
-)
+if cxx_available
+    cpp = executable(
+        'test-cpp',
+        ['cpp.cc'],
+        dependencies: libnvme_dep,
+        include_directories: [incdir, internal_incdir]
+    )
+endif
 
 register = executable(
     'test-register',
     ['register.c'],
-    link_with: libnvme,
+    dependencies: libnvme_dep,
     include_directories: [incdir, internal_incdir]
 )
 
 zns = executable(
     'test-zns',
     ['zns.c'],
-    link_with: libnvme,
+    dependencies: libnvme_dep,
+    include_directories: [incdir, internal_incdir]
+)
+
+mi = executable(
+    'test-mi',
+    ['mi.c', 'utils.c'],
+    dependencies: libnvme_mi_test_dep,
     include_directories: [incdir, internal_incdir]
 )
+
+test('mi', mi)
+
+mi_mctp = executable(
+    'test-mi-mctp',
+    ['mi-mctp.c', 'utils.c'],
+    dependencies: libnvme_mi_test_dep,
+    include_directories: [incdir, internal_incdir],
+)
+
+test('mi-mctp', mi_mctp)