From 22c91d17a56920ae6bc71a168f5b1ac92fec0466 Mon Sep 17 00:00:00 2001 From: Paul Dagnelie Date: Thu, 23 Feb 2023 13:51:42 -0800 Subject: [PATCH] fix tests Signed-off-by: Paul Dagnelie --- cmd/zpool/zpool_main.c | 4 ++-- tests/zfs-tests/cmd/libzfs_input_check.c | 4 ++-- .../tests/functional/cli_root/zpool_get/zpool_get.cfg | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c index 8ccbac96ffd4..da2fd3b2df73 100644 --- a/cmd/zpool/zpool_main.c +++ b/cmd/zpool/zpool_main.c @@ -377,8 +377,8 @@ 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] [newpool]\n")); + "[-N] [-R root]\n" + "\t [-F [-n]] [--rewind-to-checkpoint] [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 index 9b8e1298719e..8e6faba10058 100644 --- 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 index 99a70fa2c04d..0acd9e36985d 100644 --- 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