infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-19 19:30:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats 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);
}
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");
ArrayList<String> args = new ArrayList<>();
args.add(javapath);
Collections.addAll(args, getPlatformSpecificVMArgs());
if (addTestVmOptions) {
String vmopts = System.getProperty("test.vm.opts");
if (vmopts != null && vmopts.length() > 0) {
Collections.addAll(args, vmopts.split("\\s"));
}
if (addTestVmAndJavaOptions) {
Collections.addAll(args, Utils.getTestJavaOpts());
}
Collections.addAll(args, command);