From 553b25addde4fab136258f7718e274a98bfbe34a Mon Sep 17 00:00:00 2001
From: Rawi01 <Rawi01@users.noreply.github.com>
Date: Thu, 21 Oct 2021 10:38:37 +0200
Subject: [fixes #2985] Resolve var/val only once in eclipse

---
 buildScripts/tests.ant.xml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'buildScripts')

diff --git a/buildScripts/tests.ant.xml b/buildScripts/tests.ant.xml
index 9d9e9541..838ac353 100644
--- a/buildScripts/tests.ant.xml
+++ b/buildScripts/tests.ant.xml
@@ -152,13 +152,18 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn
 	
 	<macrodef name="test.eclipse-X">
 		<attribute name="version" />
+		<attribute name="compiler.compliance.level" default="latest" />
 		<sequential>
-			<echo>Running TestEclipse on eclipse-@{version} on JVM${ant.java.version}.</echo>
+			<condition property="compiler.compliance.level" value="-Dcompiler.compliance.level=@{compiler.compliance.level}" else="-Dnot=set">
+				<not><equals arg1="@{compiler.compliance.level}" arg2="latest" /></not>
+			</condition>
+			<echo>Running TestEclipse on eclipse-@{version} on JVM${ant.java.version} using. Compiler compliance level: @{compiler.compliance.level}</echo>
 			<junit haltonfailure="yes" fork="true" forkmode="once">
 				<formatter classname="lombok.ant.SimpleTestFormatter" usefile="false" unless="tests.quiet" />
 				<jvmarg value="-Xbootclasspath/a:${jdk8-rt.loc}" />
 				<jvmarg value="-Ddelombok.bootclasspath=${jdk8-rt.loc}" />
 				<jvmarg value="-javaagent:dist/lombok.jar" />
+				<jvmarg value="${compiler.compliance.level}" />
 				<classpath location="build/ant" />
 				<classpath refid="cp.test" />
 				<classpath refid="cp.stripe" />
@@ -175,11 +180,16 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn
 		<test.eclipse-X version="oxygen" />
 	</target>
 	
-	<target name="test.eclipse-202006" depends="test.formatter.compile, test.compile" description="runs the tests on your default VM, testing the 2020-03 release of eclipse">
+	<target name="test.eclipse-202006" depends="test.formatter.compile, test.compile" description="runs the tests on your default VM, testing the 2020-06 release of eclipse">
 		<fetchdep.eclipse version="202006" />
 		<test.eclipse-X version="202006" />
 	</target>
 	
+	<target name="test.eclipse-202006-jdk8" depends="test.formatter.compile, test.compile" description="runs the tests on your default VM, testing the 2020-06 release of eclipse with compiler compliance level 8">
+		<fetchdep.eclipse version="202006" />
+		<test.eclipse-X version="202006" compiler.compliance.level="8" />
+	</target>
+	
 	<macrodef name="test.ecj-X">
 		<attribute name="version" />
 		<sequential>
@@ -217,5 +227,5 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn
 	</target>
 	
 	<target name="test" depends="test.javacCurrent, test.eclipse-202006" description="runs the tests against the default JVM, javac, and eclipse" />
-	<target name="test.broad" depends="test.javac8, test.javac14, test.eclipse-oxygen, test.eclipse-202006" description="runs the tests against the default JVM, javac, and eclipse" />
+	<target name="test.broad" depends="test.javac8, test.javac14, test.eclipse-oxygen, test.eclipse-202006, test.eclipse-202006-jdk8" description="runs the tests against the default JVM, javac, and eclipse" />
 </project>
-- 
cgit