changeset 11025:222d7ca80e4f

8060026: Update jdk/test/tools/launcher tests to eliminate dependency on sun.tools.jar.Main Reviewed-by: alanb, ksrini, psandoz Contributed-by: amy.lu@oracle.com
author ksrini
date Wed, 26 Nov 2014 11:12:19 -0800
parents ae2b1027767b
children 9da9b65d6676
files test/tools/launcher/TestHelper.java
diffstat 1 files changed, 6 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/test/tools/launcher/TestHelper.java	Wed Nov 26 15:15:27 2014 +0100
+++ b/test/tools/launcher/TestHelper.java	Wed Nov 26 11:12:19 2014 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -50,6 +50,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Arrays;
 import javax.tools.JavaCompiler;
 import javax.tools.ToolProvider;
 
@@ -333,15 +334,10 @@
     }
 
    static void createJar(String... args) {
-        sun.tools.jar.Main jarTool =
-                new sun.tools.jar.Main(System.out, System.err, "JarCreator");
-        if (!jarTool.run(args)) {
-            String message = "jar creation failed with command:";
-            for (String x : args) {
-                message = message.concat(" " + x);
-            }
-            throw new RuntimeException(message);
-        }
+        List<String> cmdList = new ArrayList<>();
+        cmdList.add(jarCmd);
+        cmdList.addAll(Arrays.asList(args));
+        doExec(cmdList.toArray(new String[cmdList.size()]));
    }
 
    static void copyStream(InputStream in, OutputStream out) throws IOException {