Merging upstream version 1.13.

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

test/cpp.cc

@@ -7,6 +7,7 @@
  */
 
 #include <iostream>
+
 #include <libnvme.h>
 
 int main()

test/ioctl/ana.c

@@ -1,14 +1,15 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include <libnvme.h>
-
 #include <errno.h>
 #include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <ccan/array_size/array_size.h>
 #include <ccan/endian/endian.h>
 
+#include <libnvme.h>
+
 #include "mock.h"
 #include "util.h"
 

test/ioctl/discovery.c

@@ -1,14 +1,15 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include <libnvme.h>
-
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include <ccan/array_size/array_size.h>
 #include <ccan/endian/endian.h>
 
-#include "../../src/nvme/private.h"
+#include <libnvme.h>
+#include <nvme/private.h>
+
 #include "mock.h"
 #include "util.h"
 

test/ioctl/features.c

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include <libnvme.h>
-
 #include <errno.h>
 #include <inttypes.h>
 
+#include <libnvme.h>
+
 #include "mock.h"
 #include "util.h"
 

test/ioctl/identify.c

@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include <libnvme.h>
-
 #include <errno.h>
 #include <stdlib.h>
 
+#include <libnvme.h>
+
 #include "mock.h"
 #include "util.h"
 

test/ioctl/meson.build

@@ -14,6 +14,7 @@ mock_conf.set(
 mock_ioctl = library(
     'mock-ioctl',
     ['mock.c', 'util.c'],
+    include_directories: [incdir, internal_incdir],
     dependencies: [dl_dep],
     c_args: ['-DHAVE_GLIBC_IOCTL=' + (mock_conf.get('HAVE_GLIBC_IOCTL') ? '1' : '0')])
 

test/ioctl/mock.c

@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include "mock.h"
-
 #include <errno.h>
 #include <inttypes.h>
 #include <stdarg.h>
@@ -9,7 +7,9 @@
 #include <sys/ioctl.h>
 #include <dlfcn.h>
 
-#include "../../src/nvme/ioctl.h"
+#include <nvme/ioctl.h>
+
+#include "mock.h"
 #include "util.h"
 
 struct mock_cmds {
@@ -118,7 +118,7 @@ void end_mock_cmds(void)
 	} \
 })
 
-#ifdef HAVE_GLIBC_IOCTL
+#if defined(HAVE_GLIBC_IOCTL) && HAVE_GLIBC_IOCTL == 1
 typedef int (*ioctl_func_t)(int, unsigned long, void *);
 int ioctl(int fd, unsigned long request, ...)
 #else

test/ioctl/util.c

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
-#include "util.h"
-
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "util.h"
+
 static void hexdump(const uint8_t *buf, size_t len)
 {
 	size_t i = 0;