From 5f5a83994d31920f775659c4a6a441dd54fbd4a6 Mon Sep 17 00:00:00 2001
From: Stephan Herrmann
Date: Wed, 16 Oct 2019 20:36:39 +0200
Subject: Update jdt.core to 4.14 M1 (I20191009-1800)

---
 .../core/tests/compiler/regression/AbstractRegressionTest.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractRegressionTest.java')

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)
-- 
cgit v1.2.3