Page MenuHomeFreeBSD
Differential D29066

tests/sys/cddl: correctly quote atf_set "require.progs"
ClosedPublic
Actions

Authored by arichardson on Mar 4 2021, 6:42 PM.
Tags
None
Referenced Files
F142185127: D29066.id.diff
Fri, Jan 16, 11:17 PM
Unknown Object (File)
Dec 1 2025, 4:41 PM
Unknown Object (File)
Nov 26 2025, 11:17 PM
Unknown Object (File)
Nov 14 2025, 5:40 AM
Unknown Object (File)
Nov 8 2025, 7:06 AM
Unknown Object (File)
Nov 8 2025, 2:08 AM
Unknown Object (File)
Nov 8 2025, 12:22 AM
Unknown Object (File)
Nov 7 2025, 4:30 PM
View All Files
Subscribers
delphij
imp

Details

Reviewers
asomers
lwhsu
Commits
rG61271e7bba67: tests/sys/cddl: correctly quote atf_set "require.progs"
rG0b86424c31ec: tests/sys/cddl: correctly quote atf_set "require.progs"
Summary

The argument has to be a single whitespace-separate value. While touching
all these lines also add ksh93, since atf_set "require.progs" overrides
the default value specified in the Kyuafile. This then results in tests
being executed despite ksh93 not being installed.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 37583
Build 34472: arc lint + arc unit

Event Timeline

arichardson created this revision.Mar 4 2021, 6:42 PM
Herald added subscribers: delphij, imp. · View Herald TranscriptMar 4 2021, 6:42 PM
arichardson requested review of this revision.Mar 4 2021, 6:42 PM
Harbormaster completed remote builds in B37583: Diff 85154.Mar 4 2021, 6:42 PM
asomers accepted this revision.Mar 4 2021, 7:04 PM

I didn't look at every file, but the overall pattern looks good. However, the fact that require.progs in a test file overrides the setting in the Kyua file, rather than adding to it, is arguably a bug. Maybe you should open a bug report upstream.

This revision is now accepted and ready to land.Mar 4 2021, 7:04 PM
arichardson added a comment.Mar 4 2021, 7:05 PM
In D29066#650988, @asomers wrote:

I didn't look at every file, but the overall pattern looks good. However, the fact that require.progs in a test file overrides the setting in the Kyua file, rather than adding to it, is arguably a bug. Maybe you should open a bug report upstream.

Sounds good, I'll open an issue. Not sure if it's likely to be fixed though.

Closed by commit rG0b86424c31ec: tests/sys/cddl: correctly quote atf_set "require.progs" (authored by arichardson). · Explain WhyMar 8 2021, 9:44 AM
This revision was automatically updated to reflect the committed changes.
arichardson added a commit: rG0b86424c31ec: tests/sys/cddl: correctly quote atf_set "require.progs".
arichardson added a commit: rG61271e7bba67: tests/sys/cddl: correctly quote atf_set "require.progs".Mar 17 2021, 10:24 PM

Revision Contents
Changeset List

PathSize
tests/
sys/
cddl/
zfs/
tests/
acl/
cifs/
12 lines
nontrivial/
34 lines
trivial/
56 lines
atime/
4 lines
bootfs/
18 lines
cache/
22 lines
cachefile/
8 lines
cli_root/
zdb/
2 lines
zfs/
6 lines
zfs_clone/
18 lines
zfs_copies/
12 lines
zfs_create/
26 lines
zfs_destroy/
14 lines
zfs_diff/
2 lines
zfs_get/
20 lines
zfs_inherit/
6 lines
zfs_mount/
24 lines
zfs_promote/
16 lines
zfs_property/
2 lines
zfs_receive/
18 lines
zfs_rename/
26 lines
zfs_reservation/
4 lines
zfs_rollback/
8 lines
zfs_send/
8 lines
zfs_set/
44 lines
zfs_share/
22 lines
zfs_snapshot/
14 lines
zfs_unmount/
20 lines
zfs_unshare/
10 lines
zfs_upgrade/
14 lines
zpool/
6 lines
zpool_add/
20 lines
zpool_attach/
2 lines
zpool_clear/
10 lines
zpool_create/
40 lines
zpool_destroy/
8 lines
zpool_detach/
2 lines
zpool_expand/
6 lines
zpool_export/
8 lines
zpool_get/
8 lines
zpool_history/
4 lines
zpool_import/
46 lines
zpool_offline/
4 lines
zpool_online/
4 lines
zpool_remove/
6 lines
zpool_replace/
4 lines
zpool_scrub/
10 lines
zpool_set/
6 lines
zpool_status/
4 lines
zpool_upgrade/
18 lines
cli_user/
misc/
86 lines
zfs_list/
16 lines
zpool_iostat/
6 lines
zpool_list/
4 lines
compression/
6 lines
ctime/
2 lines
delegate/
24 lines
16 lines
devices/
4 lines
exec/
4 lines
grow_pool/
2 lines
grow_replicas/
2 lines
history/
20 lines
hotplug/
6 lines
hotspare/
52 lines
inheritance/
2 lines
interop/
2 lines
inuse/
4 lines
iscsi/
12 lines
largest_pool/
2 lines
link_count/
2 lines
migration/
24 lines
mmap/
2 lines
mount/
4 lines
mv_files/
4 lines
nestedfs/
2 lines
no_space/
2 lines
online_offline/
4 lines
pool_names/
4 lines
poolversion/
4 lines
quota/
12 lines
redundancy/
2 lines
refquota/
12 lines
refreserv/
10 lines
replacement/
6 lines
reservation/
36 lines
rootpool/
4 lines
rsend/
26 lines
scrub_mirror/
8 lines
slog/
28 lines
snapshot/
48 lines
snapused/
10 lines
sparse/
2 lines
truncate/
2 lines
userquota/
32 lines
utils_test/
18 lines
write_dirs/
4 lines
xattr/
26 lines
zfsd/
36 lines
zil/
4 lines
zinject/
8 lines
zones/
10 lines
zvol/
zvol_cli/
6 lines
zvol_misc/
16 lines
zvol_swap/
12 lines
zvol_thrash/
2 lines

Diff 85154

View Options

tests/sys/cddl/zfs/tests/acl/cifs/cifs_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/acl/nontrivial/nontrivial_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/acl/trivial/trivial_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/atime/atime_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/bootfs/bootfs_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cache/cache_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cachefile/cachefile_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zdb/zdb_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs/zfs_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs_clone/zfs_clone_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs_copies/zfs_copies_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs_create/zfs_create_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/zfs_destroy_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs_diff/zfs_diff_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/zfs_inherit_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs_promote/zfs_promote_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs_property/zfs_property_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs_receive/zfs_receive_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs_rename/zfs_rename_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/zfs_reservation_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/zfs_rollback_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs_send/zfs_send_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs_set/zfs_set_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs_share/zfs_share_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/zfs_snapshot_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/zfs_unmount_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/zfs_unshare_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/zfs_upgrade_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zpool/zpool_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zpool_add/zpool_add_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zpool_attach/zpool_attach_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zpool_clear/zpool_clear_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zpool_create/zpool_create_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/zpool_destroy_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zpool_detach/zpool_detach_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zpool_expand/zpool_expand_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zpool_export/zpool_export_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zpool_get/zpool_get_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zpool_history/zpool_history_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zpool_import/zpool_import_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zpool_offline/zpool_offline_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zpool_online/zpool_online_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zpool_remove/zpool_remove_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zpool_replace/zpool_replace_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/zpool_scrub_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zpool_set/zpool_set_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zpool_status/zpool_status_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/zpool_upgrade_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_user/misc/misc_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_user/zfs_list/zfs_list_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/zpool_iostat_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/cli_user/zpool_list/zpool_list_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/compression/compression_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/ctime/ctime_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/delegate/zfs_allow_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/delegate/zfs_unallow_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/devices/devices_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/exec/exec_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/grow_pool/grow_pool_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/grow_replicas/grow_replicas_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/history/history_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/hotplug/hotplug_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/hotspare/hotspare_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/inheritance/inheritance_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/interop/interop_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/inuse/inuse_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/iscsi/iscsi_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/largest_pool/largest_pool_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/link_count/link_count_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/migration/migration_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/mmap/mmap_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/mount/mount_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/mv_files/mv_files_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/nestedfs/nestedfs_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/no_space/no_space_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/online_offline/online_offline_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/pool_names/pool_names_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/poolversion/poolversion_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/quota/quota_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/redundancy/redundancy_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/refquota/refquota_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/refreserv/refreserv_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/replacement/replacement_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/reservation/reservation_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/rootpool/rootpool_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/rsend/rsend_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/scrub_mirror/scrub_mirror_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/slog/slog_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/snapused/snapused_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/sparse/sparse_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/truncate/truncate_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/userquota/userquota_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/utils_test/utils_test_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/write_dirs/write_dirs_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/xattr/xattr_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/zfsd/zfsd_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/zil/zil_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/zinject/zinject_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/zones/zones_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/zvol/zvol_cli/zvol_cli_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/zvol/zvol_misc/zvol_misc_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/zvol/zvol_swap/zvol_swap_test.sh

Loading...
View Options

tests/sys/cddl/zfs/tests/zvol_thrash/zvol_thrash_test.sh

Loading...