Fix test failures in I build. (eclipse-jdt#3120)

* Fixes eclipse-jdt#3118
iloveeclipse · Oct 19, 2024 · a569f00 · a569f00
1 parent a3e8ece
commit a569f00
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...lipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/IncrementalTests.java b/...lipse.jdt.core.tests.builder/src/org/eclipse/jdt/core/tests/builder/IncrementalTests.java
@@ -1665,6 +1665,10 @@ public final class Child extends Parent {
 	}
 
 	public void testExhaustiveness() throws JavaModelException {
+		String javaVersion = System.getProperty("java.version");
+		if (javaVersion != null && JavaCore.compareJavaVersions(javaVersion, "18") < 0)
+			return;
+
 		IPath projectPath = env.addProject("Project", "18");
 		env.addExternalJars(projectPath, Util.getJavaClassLibs());
 

diff --git a/...sts.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest_17.java b/...sts.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest_17.java
@@ -156,7 +156,9 @@ boolean match(String err) {
 	// Check behavior of expression switch in JDK18-
 	// https://github.com/eclipse-jdt/eclipse.jdt.core/issues/3096#issuecomment-2417954288
 	public void testGHI1774_Expression() throws Exception {
-
+		String javaVersion = System.getProperty("java.version");
+		if (javaVersion != null && JavaCore.compareJavaVersions(javaVersion, "18") < 0)
+			return;
 		String path = LIB_DIR;
 		String libPath = null;
 		if (path.endsWith(File.separator)) {