diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-02-02 12:47:20 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-02-02 12:47:20 +0000 |
| commit | 1ec9fd68b738184fa9b6833ee0b3bf6acf58a829 (patch) | |
| tree | 23e802559a99c5c105fbbd19f25c5164fe4bf5b5 /usr/src/pkg/manifests/system-test-ostest.mf | |
| parent | 27314042b35265077d05c518d5ed831ec581e719 (diff) | |
| parent | cb159270e9e67dea31dfbd991ec758829de14d35 (diff) | |
| download | illumos-joyent-1ec9fd68b738184fa9b6833ee0b3bf6acf58a829.tar.gz | |
[illumos-gate merge]
commit cb159270e9e67dea31dfbd991ec758829de14d35
7800 Support build with OpenJDK 8
commit defc4c8acfa01dba1ef3c13ca0cafccfcede51c0
7719 sdev_create() doesn't enforce EISDIR in non-GZ
Conflicts:
usr/src/test/os-tests/tests/Makefile
usr/src/test/os-tests/runfiles/default.run
Diffstat (limited to 'usr/src/pkg/manifests/system-test-ostest.mf')
| -rw-r--r-- | usr/src/pkg/manifests/system-test-ostest.mf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/usr/src/pkg/manifests/system-test-ostest.mf b/usr/src/pkg/manifests/system-test-ostest.mf index 7a1a0624f4..64daf4a64f 100644 --- a/usr/src/pkg/manifests/system-test-ostest.mf +++ b/usr/src/pkg/manifests/system-test-ostest.mf @@ -26,6 +26,7 @@ dir path=opt/os-tests/bin dir path=opt/os-tests/runfiles dir path=opt/os-tests/tests dir path=opt/os-tests/tests/file-locking +dir path=opt/os-tests/tests/sdevfs dir path=opt/os-tests/tests/secflags dir path=opt/os-tests/tests/sigqueue file path=opt/os-tests/README mode=0444 @@ -37,6 +38,7 @@ 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 file path=opt/os-tests/tests/file-locking/runtests.64 mode=0555 file path=opt/os-tests/tests/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 file path=opt/os-tests/tests/secflags/secflags_aslr mode=0555 |