Merge commit 'e3e6fd35fb0e58009c80b47e6d3e21a2c93640c0' into BETA_JAVA22

eclipse-jdt · Mar 7, 2024 · beaa2ee · beaa2ee
2 parents db1c71d + e3e6fd3
commit beaa2ee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/....tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ResourceLeakTests.java b/....tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ResourceLeakTests.java
@@ -7036,6 +7036,8 @@ public void testBug499037_010_since_9() {
 		options);
 }
 public void testGH1762() {
+	if (this.complianceLevel < ClassFileConstants.JDK1_7)
+		return; // uses t-w-r
 	runLeakTest(
 		new String[] {
 			"X.java",

diff --git a/...e.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/TestAll.java b/...e.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/TestAll.java
@@ -97,7 +97,6 @@ public static Test suite() {
 	standardTests.add(ManifestAnalyzerTest.class);
 	standardTests.add(InitializationTests.class);
 	standardTests.add(ResourceLeakTests.class);
-	standardTests.add(ResourceLeakAnnotatedTests.class);
 	standardTests.add(PackageBindingTest.class);
 
 	// add all javadoc tests
@@ -142,6 +141,8 @@ public static Test suite() {
 	since_1_7.add(PolymorphicSignatureTest.class);
 	since_1_7.add(Compliance_1_7.class);
 	since_1_7.add(MethodHandleTest.class);
+	since_1_7.add(ResourceLeakAnnotatedTests.class);
+
 
 	ArrayList since_1_8 = new ArrayList();
 	since_1_8.add(NegativeTypeAnnotationTest.class);