3 files changed, 25 insertions, 18 deletions
diff --git a/sys/contrib/openzfs/tests/zfs-tests/cmd/Makefile.am b/sys/contrib/openzfs/tests/zfs-tests/cmd/Makefile.am
index 85c3cf3c35a8..b4efefdb7ab7 100644
--- a/sys/contrib/openzfs/tests/zfs-tests/cmd/Makefile.am
+++ b/sys/contrib/openzfs/tests/zfs-tests/cmd/Makefile.am
@@ -60,7 +60,6 @@ scripts_zfs_tests_bin_PROGRAMS += %D%/file_append %D%/file_check %D%/file_trunc
 
 
 scripts_zfs_tests_bin_PROGRAMS += %D%/libzfs_input_check
-%C%_libzfs_input_check_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/include/os/@ac_system_l@/zfs
 %C%_libzfs_input_check_LDADD = \
 	libzfs_core.la \
 	libnvpair.la
@@ -117,9 +116,7 @@ scripts_zfs_tests_bin_PROGRAMS += %D%/edonr_test %D%/skein_test \
 %C%_edonr_test_SOURCES = %D%/checksum/edonr_test.c
 %C%_blake3_test_SOURCES = %D%/checksum/blake3_test.c
 %C%_skein_test_LDADD = \
-	libicp.la \
-	libspl.la \
-	libspl_assert.la
+	libzpool.la
 %C%_sha2_test_LDADD  = $(%C%_skein_test_LDADD)
 %C%_edonr_test_LDADD = $(%C%_skein_test_LDADD)
 %C%_blake3_test_LDADD = $(%C%_skein_test_LDADD)
diff --git a/sys/contrib/openzfs/tests/zfs-tests/cmd/ereports.c b/sys/contrib/openzfs/tests/zfs-tests/cmd/ereports.c
index f981d5b34438..a28495b762cd 100644
--- a/sys/contrib/openzfs/tests/zfs-tests/cmd/ereports.c
+++ b/sys/contrib/openzfs/tests/zfs-tests/cmd/ereports.c
@@ -22,11 +22,12 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <libzfs.h>
-#include <sys/zfs_ioctl.h>
 #include <sys/nvpair.h>
 #include <sys/fm/protocol.h>
 #include <sys/fm/fs/zfs.h>
 
+#define	ZEVENT_NONBLOCK	0x1
+
 /*
  * Command to output io and checksum ereport values, one per line.
  * Used by zpool_events_duplicates.ksh to check for duplicate events.
diff --git a/sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek.c b/sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek.c
index 45ba17e36c35..f46980cad111 100644
--- a/sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek.c
+++ b/sys/contrib/openzfs/tests/zfs-tests/cmd/mmap_seek.c
@@ -47,25 +47,34 @@
 #endif
 
 static void
+seek_expect(int fd, off_t offset, int whence, off_t expect_offset)
+{
+	errno = 0;
+	off_t seek_offset = lseek(fd, offset, whence);
+	if (seek_offset == expect_offset)
+		return;
+
+	int err = errno;
+	fprintf(stderr, "lseek(fd, %ld, SEEK_%s) = %ld (expected %ld)",
+	    offset, (whence == SEEK_DATA ? "DATA" : "HOLE"),
+	    seek_offset, expect_offset);
+	if (err != 0)
+		fprintf(stderr, " (errno %d [%s])\n", err, strerror(err));
+	else
+		fputc('\n', stderr);
+	exit(2);
+}
+
+static inline void
 seek_data(int fd, off_t offset, off_t expected)
 {
-	off_t data_offset = lseek(fd, offset, SEEK_DATA);
-	if (data_offset != expected) {
-		fprintf(stderr, "lseek(fd, %d, SEEK_DATA) = %d (expected %d)\n",
-		    (int)offset, (int)data_offset, (int)expected);
-		exit(2);
-	}
+	seek_expect(fd, offset, SEEK_DATA, expected);
 }
 
-static void
+static inline void
 seek_hole(int fd, off_t offset, off_t expected)
 {
-	off_t hole_offset = lseek(fd, offset, SEEK_HOLE);
-	if (hole_offset != expected) {
-		fprintf(stderr, "lseek(fd, %d, SEEK_HOLE) = %d (expected %d)\n",
-		    (int)offset, (int)hole_offset, (int)expected);
-		exit(2);
-	}
+	seek_expect(fd, offset, SEEK_HOLE, expected);
 }
 
 int