summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorTim Foster <tim.foster@joyent.com>2019-10-08 10:29:21 +0100
committerTim Foster <tim.foster@joyent.com>2019-10-08 10:29:21 +0100
commit4077dc9ab4a7c6021378b674d18935686d363a1d (patch)
treea0c8b9a7a7ff3728ac44a86b6d574275d6f6b100 /usr/src
parent88a105b9149627d43c1c296576f29027fc1795da (diff)
downloadillumos-joyent-release-20191010.tar.gz
OS-7995 incorrect entries in some system-test-*.mf filesrelease-20191010
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com> Reviewed by: John Levon <john.levon@joyent.com> Approved by: John Levon <john.levon@joyent.com>
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/pkg/manifests/system-test-ostest.mf5
-rw-r--r--usr/src/pkg/manifests/system-test-zfstest.mf3
2 files changed, 3 insertions, 5 deletions
diff --git a/usr/src/pkg/manifests/system-test-ostest.mf b/usr/src/pkg/manifests/system-test-ostest.mf
index ed58094eda..38fd6b78b9 100644
--- a/usr/src/pkg/manifests/system-test-ostest.mf
+++ b/usr/src/pkg/manifests/system-test-ostest.mf
@@ -29,6 +29,7 @@ dir path=opt/os-tests/tests/ddi_ufm
dir path=opt/os-tests/tests/file-locking
$(i386_ONLY)dir path=opt/os-tests/tests/i386
dir path=opt/os-tests/tests/pf_key
+dir path=opt/os-tests/tests/poll
dir path=opt/os-tests/tests/sdevfs
dir path=opt/os-tests/tests/secflags
dir path=opt/os-tests/tests/sigqueue
@@ -40,7 +41,6 @@ file path=opt/os-tests/runfiles/default.run mode=0444
file path=opt/os-tests/tests/ddi_ufm/ufm-test mode=0555
file path=opt/os-tests/tests/ddi_ufm/ufm-test-cleanup mode=0555
file path=opt/os-tests/tests/ddi_ufm/ufm-test-setup mode=0555
-file path=opt/os-tests/tests/epoll_test mode=0555
file path=opt/os-tests/tests/file-locking/acquire-lock.32 mode=0555
file path=opt/os-tests/tests/file-locking/acquire-lock.64 mode=0555
file path=opt/os-tests/tests/file-locking/runtests.32 mode=0555
@@ -53,7 +53,8 @@ file path=opt/os-tests/tests/pf_key/acquire-spray mode=0555
file path=opt/os-tests/tests/pf_key/eacq-enabler mode=0555
file path=opt/os-tests/tests/pf_key/kmc-update mode=0555
file path=opt/os-tests/tests/pf_key/kmc-updater mode=0555
-file path=opt/os-tests/tests/poll_test mode=0555
+file path=opt/os-tests/tests/poll/epoll_test mode=0555
+file path=opt/os-tests/tests/poll/poll_test mode=0555
file path=opt/os-tests/tests/sdevfs/sdevfs_eisdir mode=0555
file path=opt/os-tests/tests/secflags/addrs-32 mode=0555
file path=opt/os-tests/tests/secflags/addrs-64 mode=0555
diff --git a/usr/src/pkg/manifests/system-test-zfstest.mf b/usr/src/pkg/manifests/system-test-zfstest.mf
index 9680204e96..72b8d8f579 100644
--- a/usr/src/pkg/manifests/system-test-zfstest.mf
+++ b/usr/src/pkg/manifests/system-test-zfstest.mf
@@ -837,9 +837,6 @@ file path=opt/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_dryrun \
file \
path=opt/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_encrypted \
mode=0555
-file \
- path=opt/zfs-tests/tests/functional/cli_root/zfs_create/zfs_create_verbose \
- mode=0555
file path=opt/zfs-tests/tests/functional/cli_root/zfs_destroy/cleanup \
mode=0555
file path=opt/zfs-tests/tests/functional/cli_root/zfs_destroy/setup mode=0555