summaryrefslogtreecommitdiff
path: root/usr/src/pkg
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2020-05-13 17:28:38 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2020-05-13 17:28:38 +0000
commitf017ecf569add3040a006552c5a17326deb7ffae (patch)
treeac60968ce696bf486bb17e63405a7ee38dc8d676 /usr/src/pkg
parent535ab7f694a50841ab0a4107fd8f48e95a266c11 (diff)
parent4c46c814833d7980b7ebf54590a97d7f91472bd5 (diff)
downloadillumos-joyent-f017ecf569add3040a006552c5a17326deb7ffae.tar.gz
[illumos-gate merge]
commit 4c46c814833d7980b7ebf54590a97d7f91472bd5 12691 Want means of getting the maximum user address in a process commit 0c06d385ea5bbe11d20ecea2e02cdc78733d5359 12636 Prevent unnecessary resilver restarts commit 8291b3b94350ddd6df6ecd55435b59079f7a3dd2 12686 dladm: vnic creation over bge0 failed: object already exists
Diffstat (limited to 'usr/src/pkg')
-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 5cd3c7b5e8..0484e2b7e6 100644
--- a/usr/src/pkg/manifests/system-test-zfstest.mf
+++ b/usr/src/pkg/manifests/system-test-zfstest.mf
@@ -150,6 +150,7 @@ dir path=opt/zfs-tests/tests/functional/removal
dir path=opt/zfs-tests/tests/functional/rename_dirs
dir path=opt/zfs-tests/tests/functional/replacement
dir path=opt/zfs-tests/tests/functional/reservation
+dir path=opt/zfs-tests/tests/functional/resilver
dir path=opt/zfs-tests/tests/functional/rootpool
dir path=opt/zfs-tests/tests/functional/rsend
dir path=opt/zfs-tests/tests/functional/scrub_mirror
@@ -2930,6 +2931,12 @@ file path=opt/zfs-tests/tests/functional/reservation/reservation_021_neg \
file path=opt/zfs-tests/tests/functional/reservation/reservation_022_pos \
mode=0555
file path=opt/zfs-tests/tests/functional/reservation/setup mode=0555
+file path=opt/zfs-tests/tests/functional/resilver/cleanup mode=0555
+file path=opt/zfs-tests/tests/functional/resilver/resilver.cfg mode=0444
+file path=opt/zfs-tests/tests/functional/resilver/resilver_restart_001 \
+ mode=0555
+file path=opt/zfs-tests/tests/functional/resilver/setup mode=0555
+file path=opt/zfs-tests/tests/functional/resilver/sysevent mode=0555
file path=opt/zfs-tests/tests/functional/rootpool/cleanup mode=0555
file path=opt/zfs-tests/tests/functional/rootpool/rootpool_002_neg mode=0555
file path=opt/zfs-tests/tests/functional/rootpool/rootpool_003_neg mode=0555