summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Foster <tim.foster@joyent.com>2019-09-23 15:42:03 +0100
committerTim Foster <tim.foster@joyent.com>2019-09-24 11:48:52 +0100
commit8a73ac9c3b50e9a6a3fc30497c0df2a37bc453ca (patch)
tree9e018baabf8755ed13dd0fc5822bde31d9291360
parent0702468eedf9b4641b4359df530337857b0b65c1 (diff)
downloadillumos-joyent-8a73ac9c3b50e9a6a3fc30497c0df2a37bc453ca.tar.gz
OS-7995 incorrect entries in some system-test-*.mf filesgrr-OS-7995
-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 66fc12ff3a..a005f9b338 100644
--- a/usr/src/pkg/manifests/system-test-zfstest.mf
+++ b/usr/src/pkg/manifests/system-test-zfstest.mf
@@ -836,9 +836,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