fix tests

Signed-off-by: Paul Dagnelie <[email protected]>
openzfs · Feb 23, 2023 · f75424e · f75424e
1 parent 8a00a0c
commit f75424e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
@@ -377,8 +377,9 @@ get_usage(zpool_help_t idx)
 		    "[-R root] [-F [-n]] -a\n"
 		    "\timport [-o mntopts] [-o property=value] ... \n"
 		    "\t    [-d dir | -c cachefile] [-D] [-l] [-f] [-m -L pool] "
-		    "[-N] [-R root] [-F [-n]]\n"
-		    "\t    [--rewind-to-checkpoint] <pool | id> [newpool]\n"));
+		    "[-N] [-R root]\n"
+		    "\t    [-F [-n]] [--rewind-to-checkpoint] <pool | id>"
+		    " [newpool]\n"));
 	case HELP_IOSTAT:
 		return (gettext("\tiostat [[[-c [script1,script2,...]"
 		    "[-lq]]|[-rw]] [-T d | u] [-ghHLpPvy]\n"

diff --git a/tests/zfs-tests/cmd/libzfs_input_check.c b/tests/zfs-tests/cmd/libzfs_input_check.c
@@ -781,7 +781,7 @@ test_pool_recycle(const char *pool)
 {
 	nvlist_t *required = fnvlist_alloc();
 
-	fnvlist_add_uint64(required, "dryrun", B_FALSE);
+	fnvlist_add_boolean_value(required, "dryrun", B_FALSE);
 
 	IOC_INPUT_TEST_WILD(ZFS_IOC_POOL_RECYCLE, pool, required, NULL, 0);
 
@@ -1036,7 +1036,7 @@ validate_ioc_values(void)
 	CHECK(ZFS_IOC_BASE + 82 == ZFS_IOC_GET_BOOKMARK_PROPS);
 	CHECK(ZFS_IOC_BASE + 83 == ZFS_IOC_WAIT);
 	CHECK(ZFS_IOC_BASE + 84 == ZFS_IOC_WAIT_FS);
-	CHECK(ZFS_IOC_BASE + 85 == ZFS_IOC_POOL_RECYCLE);
+	CHECK(ZFS_IOC_BASE + 87 == ZFS_IOC_POOL_RECYCLE);
 	CHECK(ZFS_IOC_PLATFORM_BASE + 1 == ZFS_IOC_EVENTS_NEXT);
 	CHECK(ZFS_IOC_PLATFORM_BASE + 2 == ZFS_IOC_EVENTS_CLEAR);
 	CHECK(ZFS_IOC_PLATFORM_BASE + 3 == ZFS_IOC_EVENTS_SEEK);

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg b/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg
@@ -100,5 +100,6 @@ if is_linux || is_freebsd; then
 	    "feature@zilsaxattr"
 	    "feature@head_errlog"
 	    "feature@blake3"
+	    "feature@shared_log"
 	)
 fi