diff options
| author | Roel Spilker <r.spilker@gmail.com> | 2012-01-23 20:07:35 +0100 |
|---|---|---|
| committer | Roel Spilker <r.spilker@gmail.com> | 2012-01-23 20:12:53 +0100 |
| commit | b3a55b0c6c33535916297ddfa49b9a204ea7722b (patch) | |
| tree | c4af1e389b88747f935ce774c0a1ff4b35224713 | |
| parent | e453c22de0f7d9532c126734cfc5f11e0546c0cc (diff) | |
| download | lombok-b3a55b0c6c33535916297ddfa49b9a204ea7722b.tar.gz lombok-b3a55b0c6c33535916297ddfa49b9a204ea7722b.tar.bz2 lombok-b3a55b0c6c33535916297ddfa49b9a204ea7722b.zip | |
Test script fixes
| -rw-r--r-- | build.xml | 5 | ||||
| -rw-r--r-- | buildScripts/ivy.xml | 7 |
2 files changed, 7 insertions, 5 deletions
@@ -108,7 +108,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr </target> <target name="ensureTestDeps" depends="config-ivy"> - <ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="test" /> + <ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="test, javac6" /> <ivy:retrieve /> </target> @@ -321,10 +321,11 @@ the common tasks and can be called on to run the main aspects of all the sub-scr </target> <target name="test" depends="-test-compile, dist, test-ecj" unless="tests.skip" description="Runs the tests."> - <junit haltonfailure="yes" fork="on"> + <junit haltonfailure="yes" fork="true"> <jvmarg value="-javaagent:dist/lombok.jar" /> <formatter type="plain" usefile="false" unless="tests.quiet" /> <classpath refid="test.path" /> + <classpath path="lib/javac6/javac6.jar" /> <classpath path="build/lombok" /> <classpath path="build/tests" /> <batchtest> diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml index 4fa4787b..334a38d9 100644 --- a/buildScripts/ivy.xml +++ b/buildScripts/ivy.xml @@ -3,11 +3,12 @@ <configurations> <conf name="eclipseBuild" /> <conf name="netbeansBuild" /> - <conf name="build" extends="eclipseBuild, netbeansBuild" /> + <conf name="build" extends="eclipseBuild, netbeansBuild, javac6" /> <conf name="runtime" /> - <conf name="test" extends="build, runtime" /> + <conf name="test" extends="runtime" /> <conf name="contrib" /> <conf name="ecj" /> + <conf name="javac6" /> <conf name="javac7" /> </configurations> <dependencies> @@ -28,7 +29,7 @@ <dependency org="projectlombok.org" name="markdownj" rev="1.02b4" conf="build" /> <dependency org="de.java2html" name="java2html" rev="5.0" conf="build->default" /> - <dependency org="net.java.openjdk.custom" name="javac6" rev="1.6.0.18" conf="build->runtime; contrib->sources" /> + <dependency org="net.java.openjdk.custom" name="javac6" rev="1.6.0.18" conf="javac6->runtime; contrib->sources" /> <dependency org="net.java.openjdk.custom" name="javac7" rev="1.7.0" conf="javac7->runtime; contrib->sources" /> <dependency org="org.eclipse.custom" name="ecj" rev="3.6.2" conf="ecj->default; contrib->sources" /> |