[testing] wahey, ecj testing works again, and now we can test JDK16 features in it!

This commit is contained in:
Reinier Zwitserloot committed 2021-03-23 06:01:50 +01:00
1 parent cc98adac01
commit 3d7754e269
6 files changed
+134 -55

No files matched your search

+2
View File
@@ -28,6 +28,7 @@
<conf name="ecj8" />
<conf name="ecj11" />
<conf name="ecj14" />
<conf name="ecj16" />
<conf name="eclipse-oxygen" />
<conf name="eclipse-202006" />
@@ -76,6 +77,7 @@
<!-- ecjs -->
<dependency org="org.eclipse.jdt" name="ecj" rev="3.25.0" conf="ecj16->master" />
<dependency org="org.eclipse.jdt" name="ecj" rev="3.22.0.v20200530-2032" conf="ecj14->master" />
<dependency org="org.eclipse.jdt" name="ecj" rev="3.16.0" conf="ecj11->master" />
<!-- until oct 2016, ecj was released under org 'org.eclipse.jdt.core.compiler', and the versioning followed eclipse's versions. -->
+38 -1
View File
@@ -55,7 +55,7 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn
</ivy:compile>
</target>
<target name="test.ecj11" depends="deps, dist" description="Runs a few ecj-specific tests" unless="skip.tests">
<target name="test.ecj11.call" depends="deps, dist" description="Runs a few ecj-specific tests" unless="skip.tests">
<java jar="lib/ecj11/org.eclipse.jdt-ecj.jar" fork="true" failonerror="true">
<jvmarg value="-javaagent:dist/lombok.jar=ecj" />
<arg line="-source 1.6 -target 1.6 -cp dist/lombok.jar test/ecj/SimpleTest.java" />
@@ -165,6 +165,7 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn
<classpath refid="cp.eclipse-@{version}" />
<classpath refid="packing.basedirs.path" />
<classpath location="build/tests" />
<classpath location="build/teststubs" />
<test name="lombok.TestEclipse" />
</junit>
</sequential>
@@ -179,6 +180,42 @@ This buildfile is part of projectlombok.org. It takes care of compiling and runn
<test.eclipse-X version="202006" />
</target>
<macrodef name="test.ecj-X">
<attribute name="version" />
<sequential>
<echo>Running TestEclipse on ecj-@{version} on JVM${ant.java.version}.</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" />
<classpath location="build/ant" />
<classpath refid="cp.test" />
<classpath refid="cp.stripe" />
<classpath refid="cp.ecj@{version}" />
<classpath refid="packing.basedirs.path" />
<classpath location="build/tests" />
<classpath location="build/teststubs" />
<test name="lombok.TestEclipse" />
</junit>
</sequential>
</macrodef>
<target name="test.ecj11" depends="test.formatter.compile, test.compile" description="runs the tests on your default VM, testing the ecj11 release">
<fetchdep.ecj version="11" />
<test.ecj-X version="11" />
</target>
<target name="test.ecj14" depends="test.formatter.compile, test.compile" description="runs the tests on your default VM, testing the ecj11 release">
<fetchdep.ecj version="14" />
<test.ecj-X version="14" />
</target>
<target name="test.ecj16" depends="test.formatter.compile, test.compile" description="runs the tests on your default VM, testing the ecj11 release">
<fetchdep.ecj version="16" />
<test.ecj-X version="16" />
</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" />
</project>