test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java
--- a/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java Tue Sep 24 17:08:19 2019 +0200
+++ b/test/jdk/java/nio/channels/spi/SelectorProvider/inheritedChannel/InheritedChannelTest.java Tue Sep 24 16:19:11 2019 +0100
@@ -25,7 +25,7 @@
* @test
* @bug 4673940 4930794 8211842
* @summary Unit tests for inetd feature
- * @requires (os.family == "linux" | os.family == "solaris")
+ * @requires (os.family == "linux" | os.family == "solaris" | os.family == "mac")
* @library /test/lib
* @build jdk.test.lib.Utils
* jdk.test.lib.Asserts
@@ -33,7 +33,8 @@
* jdk.test.lib.JDKToolLauncher
* jdk.test.lib.Platform
* jdk.test.lib.process.*
- * UnixSocketTest StateTest StateTestService EchoTest EchoService CloseTest Launcher Util
+ * UnixSocketTest StateTest StateTestService EchoTest EchoService
+ * UnixDomainChannelTest CloseTest Launcher Util
* @run testng/othervm/native InheritedChannelTest
* @key intermittent
*/
@@ -73,7 +74,8 @@
@DataProvider
public Object[][] testCases() {
- return new Object[][]{
+ return new Object[][] {
+ { "UnixDomainChannelTest", List.of(UnixDomainChannelTest.class.getName())},
{ "UnixSocketTest", List.of(UnixSocketTest.class.getName())},
{ "StateTest", List.of(StateTest.class.getName()) },
{ "EchoTest", List.of(EchoTest.class.getName()) },
@@ -83,6 +85,7 @@
// Note that the system properties are arguments to StateTest and not options.
// These system properties are passed to the launched service as options:
// java [-options] class [args...]
+
{ "StateTest run with " + POLICY_PASS, List.of(StateTest.class.getName(),
"-Djava.security.manager",
"-Djava.security.policy="
@@ -97,7 +100,7 @@
};
}
- @Test(dataProvider = "testCases")
+ @Test(dataProvider = "testCases", timeOut=30000)
public void test(String desc, List<String> opts) throws Throwable {
String pathVar = Platform.sharedLibraryPathVariableName();
System.out.println(pathVar + "=" + libraryPath);