From 233400eacba84ec33bfba5207481a6f5ec00aa65 Mon Sep 17 00:00:00 2001 From: Sander Koning Date: Wed, 22 Feb 2017 10:17:30 +0100 Subject: [PATCH 1/3] Make tests run if no (eclipse-generated?) bin/ folder exists --- test/core/src/lombok/RunTestsViaEcj.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/core/src/lombok/RunTestsViaEcj.java b/test/core/src/lombok/RunTestsViaEcj.java index 3f2698bb..775e825c 100644 --- a/test/core/src/lombok/RunTestsViaEcj.java +++ b/test/core/src/lombok/RunTestsViaEcj.java @@ -137,7 +137,7 @@ public class RunTestsViaEcj extends AbstractRunTests { i.remove(); } } - classpath.add("bin"); + if (new File("bin").exists()) classpath.add("bin"); classpath.add("dist/lombok.jar"); classpath.add("lib/test/commons-logging-commons-logging.jar"); classpath.add("lib/test/org.slf4j-slf4j-api.jar"); From ea9fbb426f60bd1b7c3dea2b0485eae8eaafedda Mon Sep 17 00:00:00 2001 From: Sander Koning Date: Wed, 22 Feb 2017 10:18:33 +0100 Subject: [PATCH 2/3] Use already downloaded rt-openjdk6.jar if it exists. This allows builds to run without a network connection. --- build.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build.xml b/build.xml index 654c23ea..44f09de8 100644 --- a/build.xml +++ b/build.xml @@ -28,7 +28,8 @@ the common tasks and can be called on to run the main aspects of all the sub-scr - + + @@ -101,8 +102,8 @@ the common tasks and can be called on to run the main aspects of all the sub-scr - - + + From 1244721734a2025d1e3268f09846f9469f10f415 Mon Sep 17 00:00:00 2001 From: Sander Koning Date: Wed, 22 Feb 2017 10:19:01 +0100 Subject: [PATCH 3/3] Rename a set of case-differing transformation tests to make them work on case-sensitive file systems. --- ...ashcodeOfExclude.java => EqualsAndHashCodeOfAndExclude.java} | 0 ...ashcodeOfExclude.java => EqualsAndHashCodeOfAndExclude.java} | 2 +- ...ashCodeOfExclude.java => EqualsAndHashCodeOfAndExclude.java} | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename test/transform/resource/after-delombok/{EqualsAndHashcodeOfExclude.java => EqualsAndHashCodeOfAndExclude.java} (100%) rename test/transform/resource/after-ecj/{EqualsAndHashcodeOfExclude.java => EqualsAndHashCodeOfAndExclude.java} (99%) rename test/transform/resource/before/{EqualsAndHashCodeOfExclude.java => EqualsAndHashCodeOfAndExclude.java} (98%) diff --git a/test/transform/resource/after-delombok/EqualsAndHashcodeOfExclude.java b/test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java similarity index 100% rename from test/transform/resource/after-delombok/EqualsAndHashcodeOfExclude.java rename to test/transform/resource/after-delombok/EqualsAndHashCodeOfAndExclude.java diff --git a/test/transform/resource/after-ecj/EqualsAndHashcodeOfExclude.java b/test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java similarity index 99% rename from test/transform/resource/after-ecj/EqualsAndHashcodeOfExclude.java rename to test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java index 283c5430..30de15cf 100644 --- a/test/transform/resource/after-ecj/EqualsAndHashcodeOfExclude.java +++ b/test/transform/resource/after-ecj/EqualsAndHashCodeOfAndExclude.java @@ -43,4 +43,4 @@ final @lombok.EqualsAndHashCode(exclude = {"y"}) class EqualsAndHashCodeExclude result = ((result * PRIME) + this.x); return result; } -} \ No newline at end of file +} diff --git a/test/transform/resource/before/EqualsAndHashCodeOfExclude.java b/test/transform/resource/before/EqualsAndHashCodeOfAndExclude.java similarity index 98% rename from test/transform/resource/before/EqualsAndHashCodeOfExclude.java rename to test/transform/resource/before/EqualsAndHashCodeOfAndExclude.java index 0625ba52..b8ba21fb 100644 --- a/test/transform/resource/before/EqualsAndHashCodeOfExclude.java +++ b/test/transform/resource/before/EqualsAndHashCodeOfAndExclude.java @@ -8,4 +8,4 @@ final class EqualsAndHashCodeOf { final class EqualsAndHashCodeExclude { int x; int y; -} \ No newline at end of file +}