Bug 473904 - Run official platform tests with Java 8
diff --git a/bundles/org.eclipse.build.tools/src/org/eclipse/releng/generators/TestResultsGenerator.java b/bundles/org.eclipse.build.tools/src/org/eclipse/releng/generators/TestResultsGenerator.java
index de9ec7a..864a737 100644
--- a/bundles/org.eclipse.build.tools/src/org/eclipse/releng/generators/TestResultsGenerator.java
+++ b/bundles/org.eclipse.build.tools/src/org/eclipse/releng/generators/TestResultsGenerator.java
@@ -262,7 +262,7 @@
private String[] testsConfigDefaults = { "linux.gtk.x86_64_8.0.xml", "macosx.cocoa.x86_64_7.0.xml",
"win32.win32.x86_7.0.xml" };
- private String[] testsConfigExpected;
+ private String testsConfigExpected;
private String[] testsConfig;
private int missingCount = 0;
@@ -1203,20 +1203,32 @@
writeFile(outputFileName, testResultsTemplateString);
}
- public String[] getTestsConfigExpected() {
- if (testsConfigExpected == null) {
- return testsConfigDefaults;
- }
+ public String getTestsConfigExpected() {
+
return testsConfigExpected;
}
- public void setTestsConfigExpected(String[] testsConfigExpected) {
+ public void setTestsConfigExpected(String testsConfigExpected) {
this.testsConfigExpected = testsConfigExpected;
}
public String[] getTestsConfig() {
if (testsConfig == null) {
- return getTestsConfigExpected();
+ String expectedConfigParam = getTestsConfigExpected();
+ if (expectedConfigParam != null)
+ {
+ StringTokenizer tokenizer = new StringTokenizer(expectedConfigParam, " ,\t");
+ int nTokens = tokenizer.countTokens();
+ String[] tokens = new String[nTokens];
+ int i=0;
+ while (tokenizer.hasMoreTokens()) {
+ tokens[i++] = tokenizer.nextToken();
+ }
+ testsConfig = tokens;
+ }
+ else {
+ testsConfig = testsConfigDefaults;
+ }
}
return testsConfig;
}
