Rewrite Support_Exec to support timeouts on waiting processes.

Also rewriting SupportExec to use ProcessBuilder rather
than Runtime.exec(). Changed callers to use the ProcessBuilder
directly rather than calling-through chained methods.

1 files changed, 10 insertions, 11 deletions

diff --git a/security/src/test/java/tests/api/java/security/PermissionCollectionTest.java b/security/src/test/java/tests/api/java/security/PermissionCollectionTest.java
index f36f119..35e3749 100644
--- a/security/src/test/java/tests/api/java/security/PermissionCollectionTest.java
+++ b/security/src/test/java/tests/api/java/security/PermissionCollectionTest.java
@@ -28,6 +28,8 @@ import java.security.SecurityPermission;
 import java.util.StringTokenizer;
 
 import tests.support.Support_Exec;
+import static tests.support.Support_Exec.javaProcessBuilder;
+import static tests.support.Support_Exec.execAndGetOutput;
 import tests.support.Support_GetLocal;
 import tests.support.resource.Support_Resources;
 import dalvik.annotation.KnownFailure;
@@ -168,17 +170,14 @@ public class PermissionCollectionTest extends junit.framework.TestCase {
             }
         }
 
-        String classPath = new File(classURL.getFile()).getPath();
-
-        // Execute Support_PermissionCollection in another VM
-        String[] classPathArray = new String[2];
-        classPathArray[0] = classPath;
-        classPathArray[1] = jarFile.getPath();
-        String[] args = { "-Djava.security.policy=" + policyFile.toURL(),
-                "tests.support.Support_PermissionCollection",
-                signedBKS.toExternalForm() };
-
-        String result = Support_Exec.execJava(args, classPathArray, true);
+        ProcessBuilder builder = javaProcessBuilder();
+        builder.command().add("-cp");
+        builder.command().add(Support_Exec.createPath(
+                new File(classURL.getFile()).getPath(), jarFile.getPath()));
+        builder.command().add("-Djava.security.policy=" + policyFile.toURL());
+        builder.command().add("tests.support.Support_PermissionCollection");
+        builder.command().add(signedBKS.toExternalForm());
+        String result = execAndGetOutput(builder);
 
         StringTokenizer resultTokenizer = new StringTokenizer(result, ",");