tags = ['functional', 'cli_root', 'zfs_upgrade']
[tests/functional/cli_root/zfs_wait]
-tests = ['zfs_wait_deleteq']
+tests = ['zfs_wait_deleteq', 'zfs_wait_getsubopt']
tags = ['functional', 'cli_root', 'zfs_wait']
[tests/functional/cli_root/zhack]
[tests/functional/cli_user/zfs_list]
tests = ['zfs_list_001_pos', 'zfs_list_002_pos', 'zfs_list_003_pos',
- 'zfs_list_004_neg', 'zfs_list_007_pos', 'zfs_list_008_neg']
+ 'zfs_list_004_neg', 'zfs_list_005_neg', 'zfs_list_007_pos',
+ 'zfs_list_008_neg']
user =
tags = ['functional', 'cli_user', 'zfs_list']
tags = ['functional', 'cli_root', 'zfs_upgrade']
[tests/functional/cli_root/zfs_wait]
-tests = ['zfs_wait_deleteq']
+tests = ['zfs_wait_deleteq', 'zfs_wait_getsubopt']
tags = ['functional', 'cli_root', 'zfs_wait']
[tests/functional/cli_root/zpool]
set -f # Force ksh ignore '?' and '*'
set -A bad_combine "ALL" "\-R all" "-P all" "-h all" "-rph all" "-RpH all" "-PrH all" \
- "-o all" "-s all" "-? all" "-* all" "-?* all" "all -r" "all -p" \
+ "-o all" "-s all" "-s none=getsubopt" "-t filesystem=getsubopt" \
+ "-? all" "-* all" "-?* all" "all -r" "all -p" \
"all -H" "all -rp" "all -rH" "all -ph" "all -rpH" "all -r $TESTPOOL" \
"all -H $TESTPOOL" "all -p $TESTPOOL" "all -r -p -H $TESTPOOL" \
"all -rph $TESTPOOL" "all,available,reservation $TESTPOOL" \
"-o" "-o ,,,,," "-o -o -o -o" "-o NAME,PROPERTY,VALUE,SOURCE" \
"-o name,properTy,value,source" "-o name, property, value,source" \
"-o name:property:value:source" "-o name,property:value,source" \
- "-o name;property;value;source"
+ "-o name;property;value;source" "-o name=getsubopt"
typeset -i i=0
while (( i < ${#badargs[*]} ))
dist_pkgdata_SCRIPTS = \
setup.ksh \
cleanup.ksh \
- zfs_wait_deleteq.ksh
+ zfs_wait_deleteq.ksh \
+ zfs_wait_getsubopt.ksh
dist_pkgdata_DATA = \
zfs_wait.kshlib
--- /dev/null
+#!/bin/ksh -p
+# SPDX-License-Identifier: 0BSD
+
+. $STF_SUITE/include/libtest.shlib
+
+#
+# DESCRIPTION:
+# zfs wait -t used to accept getsubopt(3)-style deleteq=whatever;
+# it doesn't anymore
+#
+
+log_mustnot zfs wait -t deleteq=getsubopt $TESTPOOL
+
+log_pass "'zfs wait -t' doesn't accept =getsubopt suffixes."
"nosuchproperty $TESTPOOL" "--$TESTPOOL" "all all" \
"type $TESTPOOL" "usage: $TESTPOOL" "bootfs $TESTPOOL@" \
"bootfs,bootfs $TESTPOOL" "name $TESTPOOL" "t%d%s" \
- "bootfs,delegation $TESTPOOL" "delegation $TESTPOOL@"
+ "bootfs,delegation $TESTPOOL" "delegation $TESTPOOL@" \
+ "-o name=getsubopt allocated $TESTPOOL"
for arg in $arguments
do
log_fail "Error message did not contain phrase 'no such pool'."
zpool wait -t foo $TESTPOOL 2>&1 | grep -i 'invalid activity' || \
log_fail "Error message did not contain phrase 'invalid activity'."
+zpool wait -t scrub=getsubopt $TESTPOOL 2>&1 | grep -i 'invalid activity' || \
+ log_fail "getsubopt(3) error message did not contain phrase 'invalid activity'."
log_pass "'zpool wait' behaves sensibly when invoked incorrectly."
zfs_list_002_pos.ksh \
zfs_list_003_pos.ksh \
zfs_list_004_neg.ksh \
+ zfs_list_005_neg.ksh \
zfs_list_007_pos.ksh \
zfs_list_008_neg.ksh
--- /dev/null
+#!/bin/ksh -p
+# SPDX-License-Identifier: 0BSD
+
+. $STF_SUITE/include/libtest.shlib
+
+#
+# DESCRIPTION:
+# zfs list -t used to accept getsubopt(3)-style filesystem=whatever;
+# it doesn't anymore
+#
+
+log_mustnot zfs list -t filesystem=getsubopt
+
+log_pass "'zfs list -t' doesn't accept =getsubopt suffixes."