Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2019-10-16 18:36:39 +0000
committerStephan Herrmann2019-10-16 18:36:39 +0000
commit5f5a83994d31920f775659c4a6a441dd54fbd4a6 (patch)
treea5d01bbec06c3d74105770f338023a488b0f1be0 /org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java
parent7a7292f8d5f1532f1e85ef02ad522eec7d61e2c5 (diff)
downloadorg.eclipse.objectteams-5f5a83994d31920f775659c4a6a441dd54fbd4a6.tar.gz
org.eclipse.objectteams-5f5a83994d31920f775659c4a6a441dd54fbd4a6.tar.xz
org.eclipse.objectteams-5f5a83994d31920f775659c4a6a441dd54fbd4a6.zip
Update jdt.core to 4.14 M1 (I20191009-1800)
Diffstat (limited to 'org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java')
-rw-r--r--org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java
index 53389d33a..582f257a6 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java
@@ -106,7 +106,7 @@ import org.osgi.framework.Bundle;
public abstract class AbstractRegressionTest extends AbstractCompilerTest implements StopableTestCase {
static final String[] env = System.getenv().entrySet().stream()
- .filter(e -> !"JAVA_TOOL_OPTIONS".equals(e.getKey()))
+ .filter(e -> !"JAVA_TOOL_OPTIONS".equals(e.getKey()) && !"_JAVA_OPTIONS".equals(e.getKey()))
.map(e -> e.getKey() + "=" + e.getValue())
.toArray(String[]::new);
@@ -382,6 +382,12 @@ static class JavacCompiler {
if ("1.8.0_182".equals(rawVersion)) {
return 2500;
}
+ if ("1.8.0_202".equals(rawVersion)) {
+ return 2600;
+ }
+ if ("1.8.0_212".equals(rawVersion)) {
+ return 2700;
+ }
}
if (version == JavaCore.VERSION_9) {
if ("9".equals(rawVersion)) {
@@ -2440,6 +2446,8 @@ protected void runJavac(
}
private void deleteSourceFiles(File directory) {
try {
+ if (!directory.exists())
+ return;
Files.walk(directory.toPath())
.filter(f -> f.endsWith(SuffixConstants.SUFFIX_STRING_java))
.map(java.nio.file.Path::toFile)

Back to the top