test/jdk/java/net/httpclient/security/Driver.java

@@ -32,11 +32,11 @@
  * @compile ../../../../com/sun/net/httpserver/LogFilter.java
  * @compile ../../../../com/sun/net/httpserver/FileServerHandler.java
  * @compile ../ProxyServer.java
  * @build Security
  *
- * @run driver/timeout=90 Driver
+ * @run main/othervm Driver
  */
 
 /**
  * driver required for allocating free portnumbers and putting this number
  * into security policy file used in some tests.

@@ -50,12 +50,10 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
-
-import jdk.testlibrary.OutputAnalyzer;
 import jdk.testlibrary.Utils;
 
 /**
  * Driver for tests
  */

@@ -121,10 +119,12 @@
         int retval = 10; // 10 is special exit code denoting a bind error
                          // in which case, we retry
         while (retval == 10) {
             List<String> cmd = new ArrayList<>();
             cmd.add(javaCmd);
+            cmd.add("-ea");
+            cmd.add("-esa");
             cmd.add("-Dtest.jdk=" + testJdk);
             cmd.add("-Dtest.src=" + testSrc);
             cmd.add("-Dtest.classes=" + testClasses);
             cmd.add("-Djava.security.manager");
             cmd.add("--add-modules=jdk.incubator.httpclient");

@@ -140,15 +140,19 @@
             ProcessBuilder processBuilder = new ProcessBuilder(cmd)
                 .redirectOutput(ProcessBuilder.Redirect.PIPE)
                 .redirectErrorStream(true);
 
             String cmdLine = cmd.stream().collect(Collectors.joining(" "));
+            long start = System.currentTimeMillis();
             Process child = processBuilder.start();
             Logger log = new Logger(cmdLine, child, testClasses);
             log.start();
             retval = child.waitFor();
-            System.out.println("retval = " + retval);
+            long elapsed = System.currentTimeMillis() - start;
+            System.out.println("Security " + testnum
+                               + ": retval = " + retval
+                               + ", duration=" + elapsed+" ms");
         }
         if (retval != 0) {
             Thread.sleep(2000);
             throw new RuntimeException("Non zero return value");
         }