From b3a55b0c6c33535916297ddfa49b9a204ea7722b Mon Sep 17 00:00:00 2001
From: Roel Spilker <r.spilker@gmail.com>
Date: Mon, 23 Jan 2012 20:07:35 +0100
Subject: Test script fixes

---
 build.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 7bb2c7c0..132ccc7a 100644
--- a/build.xml
+++ b/build.xml
@@ -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>
-- 
cgit 


From b8049aa1c79aa964f06d9b284c29d4c5241630d8 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Mon, 23 Jan 2012 20:21:55 +0100
Subject: Okay, now the build should be truly fixed again... at least, if 
 you're running on a 1.6 VM.

The test run now has more fine-grained dependency control, in preparation for running tests against multiple different platform versions (javac1.6, old eclipse, new eclipse, etc)
---
 build.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index 132ccc7a..d78f72b2 100644
--- a/build.xml
+++ b/build.xml
@@ -48,6 +48,12 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 		</fileset>
 	</path>
 	
+	<path id="eclipseBuild.path">
+		<fileset dir="lib/eclipseBuild">
+			<include name="*.jar" />
+		</fileset>
+	</path>
+	
 	<target name="-defSSH" depends="ensureBuildDeps">
 		<taskdef name="scp" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.Scp" classpathref="build.path" />
 		<taskdef name="sshexec" classname="org.apaxhe.tools.ant.taskdefs.optional.ssh.SSHExec" classpathref="build.path" />
@@ -108,7 +114,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, javac6" />
+		<ivy:resolve file="buildScripts/ivy.xml" refresh="true" conf="test, javac6, eclipseBuild" />
 		<ivy:retrieve />
 	</target>
 	
@@ -298,6 +304,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 		<mkdir dir="build/tests" />
 		<ivy:compile destdir="build/tests" source="1.5" target="1.5" includeantruntime="false">
 			<classpath refid="test.path" />
+			<classpath refid="build.path" />
 			<classpath path="build/lombok" />
 			<src path="test/core/src" />
 			<src path="test/transform/src" />
@@ -325,6 +332,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 			<jvmarg value="-javaagent:dist/lombok.jar" />
 			<formatter type="plain" usefile="false" unless="tests.quiet" />
 			<classpath refid="test.path" />
+			<classpath refid="eclipseBuild.path" />
 			<classpath path="lib/javac6/javac6.jar" />
 			<classpath path="build/lombok" />
 			<classpath path="build/tests" />
-- 
cgit 


From 4c04aca3fbb12f526b2e0c102f2beaf89a134f25 Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Mon, 23 Jan 2012 20:48:25 +0100
Subject: further fixes to the build script. I think it's good now....

---
 .gitignore | 1 +
 build.xml  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'build.xml')

diff --git a/.gitignore b/.gitignore
index 593e7f82..a85c2d04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /lombok.iml
 /.idea
 *.markdown.html
+/junit*.properties
\ No newline at end of file
diff --git a/build.xml b/build.xml
index d78f72b2..7ad4ce0e 100644
--- a/build.xml
+++ b/build.xml
@@ -278,7 +278,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 			<os family="mac" />
 		</condition>
 		
-		<property name="putJavacOnBootclasspath" value="-Xbootclasspath/p:lib/test/javac6.jar" />
+		<property name="putJavacOnBootclasspath" value="-Xbootclasspath/p:lib/javac6/javac6.jar" />
 		
 		<copy
 				file="buildScripts/eclipse-debug-target.template"
-- 
cgit