summaryrefslogtreecommitdiff
path: root/usr/src/pkg/manifests/system-test-zfstest.mf
diff options
context:
space:
mode:
authorJason King <jasonbking@users.noreply.github.com>2020-06-03 15:03:49 -0500
committerGitHub <noreply@github.com>2020-06-03 15:03:49 -0500
commit71b43f2a12f58ef8bc5a1965a3b742749bb49231 (patch)
tree4369300a9f43681a8ea759142d919982a0db2a31 /usr/src/pkg/manifests/system-test-zfstest.mf
parent1522aad90cd52cad5f5eb1fae5521a9630ae60f0 (diff)
downloadillumos-joyent-71b43f2a12f58ef8bc5a1965a3b742749bb49231.tar.gz
OS-8054 inotify watches lead to EBUSY during zfs mount (#305)release-20200604
Portions contributed by: Mike Gerdts <mike.gerdts@joyent.com> Reviewed by: John Levon <john.levon@joyent.com> Reviewed by: Dan McDonald <danmcd@joyent.com> Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/pkg/manifests/system-test-zfstest.mf')
-rw-r--r--usr/src/pkg/manifests/system-test-zfstest.mf7
1 files changed, 7 insertions, 0 deletions
diff --git a/usr/src/pkg/manifests/system-test-zfstest.mf b/usr/src/pkg/manifests/system-test-zfstest.mf
index 0f05230a9b..9f78c29bb5 100644
--- a/usr/src/pkg/manifests/system-test-zfstest.mf
+++ b/usr/src/pkg/manifests/system-test-zfstest.mf
@@ -203,6 +203,7 @@ file path=opt/zfs-tests/bin/randwritecomp mode=0555
file path=opt/zfs-tests/bin/readmmap mode=0555
file path=opt/zfs-tests/bin/rename_dir mode=0555
file path=opt/zfs-tests/bin/rm_lnkcnt_zero_file mode=0555
+file path=opt/zfs-tests/bin/watch_dir mode=0555
file path=opt/zfs-tests/bin/zfstest mode=0555
file path=opt/zfs-tests/callbacks/zfs_dbgmsg mode=0555
file path=opt/zfs-tests/callbacks/zfs_mmp mode=0555
@@ -1027,6 +1028,12 @@ file \
file \
path=opt/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_encrypted \
mode=0555
+file \
+ path=opt/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_watched_inotify \
+ mode=0555
+file \
+ path=opt/zfs-tests/tests/functional/cli_root/zfs_mount/zfs_mount_watched_portfs \
+ mode=0555
file path=opt/zfs-tests/tests/functional/cli_root/zfs_program/cleanup \
mode=0555
file path=opt/zfs-tests/tests/functional/cli_root/zfs_program/setup mode=0555