equal
deleted
inserted
replaced
333 |
333 |
334 /** |
334 /** |
335 * Create ProcessBuilder using the java launcher from the jdk to be tested and |
335 * Create ProcessBuilder using the java launcher from the jdk to be tested and |
336 * with any platform specific arguments prepended |
336 * with any platform specific arguments prepended |
337 */ |
337 */ |
338 public static ProcessBuilder createJavaProcessBuilder(String... command) throws Exception { |
338 public static ProcessBuilder createJavaProcessBuilder(String... command) { |
339 return createJavaProcessBuilder(false, command); |
339 return createJavaProcessBuilder(false, command); |
340 } |
340 } |
341 |
341 |
342 /** |
342 /** |
343 * Create ProcessBuilder using the java launcher from the jdk to be tested, |
343 * Create ProcessBuilder using the java launcher from the jdk to be tested, |
346 * @param addTestVmAndJavaOptions If true, adds test.vm.opts and test.java.opts |
346 * @param addTestVmAndJavaOptions If true, adds test.vm.opts and test.java.opts |
347 * to the java arguments. |
347 * to the java arguments. |
348 * @param command Arguments to pass to the java command. |
348 * @param command Arguments to pass to the java command. |
349 * @return The ProcessBuilder instance representing the java command. |
349 * @return The ProcessBuilder instance representing the java command. |
350 */ |
350 */ |
351 public static ProcessBuilder createJavaProcessBuilder(boolean addTestVmAndJavaOptions, String... command) throws Exception { |
351 public static ProcessBuilder createJavaProcessBuilder(boolean addTestVmAndJavaOptions, String... command) { |
352 String javapath = JDKToolFinder.getJDKTool("java"); |
352 String javapath = JDKToolFinder.getJDKTool("java"); |
353 |
353 |
354 ArrayList<String> args = new ArrayList<>(); |
354 ArrayList<String> args = new ArrayList<>(); |
355 args.add(javapath); |
355 args.add(javapath); |
356 Collections.addAll(args, getPlatformSpecificVMArgs()); |
356 Collections.addAll(args, getPlatformSpecificVMArgs()); |