archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-15 16:44:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8039260: c.o.j.t.ProcessTools::createJavaProcessBuilder(boolean, String... ) must also take TestJavaOptions

Browse source 
Reviewed-by: kvn, iignatyev
This commit is contained in:
Lev Priima 2014-04-17 18:54:09 +04:00 • committed by Igor Ignatyev
parent 728ea561aa
commit a138550830
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
hotspot/test/testlibrary/com/oracle/java/testlibrary/ProcessTools.java
View file

@ -145,18 +145,15 @@ public final class ProcessTools {
return createJavaProcessBuilder(false, command); return createJavaProcessBuilder(false, command);
} }
public static ProcessBuilder createJavaProcessBuilder(boolean addTestVmOptions, String... command) throws Exception { public static ProcessBuilder createJavaProcessBuilder(boolean addTestVmAndJavaOptions, String... command) throws Exception {
String javapath = JDKToolFinder.getJDKTool("java"); String javapath = JDKToolFinder.getJDKTool("java");
ArrayList<String> args = new ArrayList<>(); ArrayList<String> args = new ArrayList<>();
args.add(javapath); args.add(javapath);
Collections.addAll(args, getPlatformSpecificVMArgs()); Collections.addAll(args, getPlatformSpecificVMArgs());
if (addTestVmOptions) { if (addTestVmAndJavaOptions) {
String vmopts = System.getProperty("test.vm.opts"); Collections.addAll(args, Utils.getTestJavaOpts());
if (vmopts != null && vmopts.length() > 0) {
Collections.addAll(args, vmopts.split("\\s"));
}
} }
Collections.addAll(args, command); Collections.addAll(args, command);