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

8028708: TEST_BUG, Tests should pass through VM options, langtools tests

Browse source 
Reviewed-by: jjg, vromero
This commit is contained in:
Andrey Nazarov 2013-12-16 15:07:13 +00:00 • committed by Vicente Romero
parent 4d99383951
commit 213b16163b
4 changed files with 72 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

22
langtools/test/tools/javac/lib/ToolBox.java
View file

@ -69,27 +69,17 @@ public class ToolBox {
public static final Path javaBinary = Paths.get(jdkUnderTest, "bin", "java");
public static final Path javacBinary = Paths.get(jdkUnderTest, "bin", "javac");
public static final List<String> testToolVMOpts;
public static final List<String> testVMOpts;
public static final List<String> testVMOpts = readOptions("test.vm.opts");
public static final List<String> testToolVMOpts = readOptions("test.tool.vm.opts");
public static final List<String> testJavaOpts = readOptions("test.java.opts");
private static final Charset defaultCharset = Charset.defaultCharset();
static final JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
static {
String sysProp = System.getProperty("test.tool.vm.opts");
if (sysProp != null && sysProp.length() > 0) {
testToolVMOpts = Arrays.asList(sysProp.split("\\s+"));
} else {
testToolVMOpts = Collections.<String>emptyList();
}
sysProp = System.getProperty("test.vm.opts");
if (sysProp != null && sysProp.length() > 0) {
testVMOpts = Arrays.asList(sysProp.split("\\s+"));
} else {
testVMOpts = Collections.<String>emptyList();
}
private static List<String> readOptions(String property) {
String options = System.getProperty(property, "");
return options.length() > 0 ? Arrays.asList(options.split("\\s+")) : Collections.<String>emptyList();
}
/**