From be0a9ec2ed0946d372139285ba8e04349dca4ffb Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Mon, 11 Dec 2017 21:28:46 +0100
Subject: ‘fixed’ ecj testing on JDK9 by requiring that you download the
 Oracle8 rt.jar. Fortunately, we already had an optional ant task to fetch
 this. I’ve simply made it less optional.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.xml                                | 2 +-
 test/core/src/lombok/RunTestsViaEcj.java | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 76d66821..0b8d86c6 100644
--- a/build.xml
+++ b/build.xml
@@ -503,7 +503,7 @@ ${sourceWarning}</echo>
 		</ivy:compile>
 	</target>
 	
-	<target name="test-ecj" depends="dist, contrib" unless="tests.skip">
+	<target name="test-ecj" depends="dist, contrib, setupJavaOracle8TestEnvironment" unless="tests.skip">
 		<condition property="ecj.loc" value="lib/ecj9/*" else="lib/ecj8/*">
 			<equals arg1="${ant.java.version}" arg2="9" />
 		</condition>
diff --git a/test/core/src/lombok/RunTestsViaEcj.java b/test/core/src/lombok/RunTestsViaEcj.java
index 775e825c..6ed1e950 100644
--- a/test/core/src/lombok/RunTestsViaEcj.java
+++ b/test/core/src/lombok/RunTestsViaEcj.java
@@ -24,7 +24,6 @@ package lombok;
 import java.io.File;
 import java.io.StringWriter;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -131,7 +130,6 @@ public class RunTestsViaEcj extends AbstractRunTests {
 	
 	private FileSystem createFileSystem(File file) {
 		List<String> classpath = new ArrayList<String>();
-		classpath.addAll(Arrays.asList(System.getProperty("sun.boot.class.path").split(File.pathSeparator)));
 		for (Iterator<String> i = classpath.iterator(); i.hasNext();) {
 			if (FileSystem.getClasspath(i.next(), "UTF-8", null) == null) {
 				i.remove();
@@ -139,6 +137,7 @@ public class RunTestsViaEcj extends AbstractRunTests {
 		}
 		if (new File("bin").exists()) classpath.add("bin");
 		classpath.add("dist/lombok.jar");
+		classpath.add("lib/oracleJDK8Environment/rt.jar");
 		classpath.add("lib/test/commons-logging-commons-logging.jar");
 		classpath.add("lib/test/org.slf4j-slf4j-api.jar");
 		classpath.add("lib/test/org.slf4j-slf4j-ext.jar");
-- 
cgit