From bb5180469c77ad935f7d3d49d063eb172d57e3ea Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Thu, 1 Nov 2018 13:53:25 +0100 Subject: [PATCH] Fix test setup for Eclipse Photon and greater When a source folder is marked as a test folder, JDT requires that it has an output folder different from the one used for regular sources. Therefore give the test folders in org.eclipse.jgit.test a separate output folder "bin-tst". Moreover JDT reports errors if non-test classes have dependencies on test classes. Therefore remove the "test" annotation from org.eclipse.jgit.junit. Change-Id: Ib527439ff5b7d7b570b8a60819ecaa70f59c63a3 Signed-off-by: Thomas Wolf --- org.eclipse.jgit.junit/.classpath | 6 +----- org.eclipse.jgit.test/.classpath | 12 ++++-------- org.eclipse.jgit.test/.gitignore | 1 + org.eclipse.jgit.test/build.properties | 4 +++- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/org.eclipse.jgit.junit/.classpath b/org.eclipse.jgit.junit/.classpath index 3e5654f17e..eca7bdba8f 100644 --- a/org.eclipse.jgit.junit/.classpath +++ b/org.eclipse.jgit.junit/.classpath @@ -2,10 +2,6 @@ - - - - - + diff --git a/org.eclipse.jgit.test/.classpath b/org.eclipse.jgit.test/.classpath index 3b0dd26bc5..3a0a10e33c 100644 --- a/org.eclipse.jgit.test/.classpath +++ b/org.eclipse.jgit.test/.classpath @@ -1,21 +1,17 @@ - + - + + - - - - - - + diff --git a/org.eclipse.jgit.test/.gitignore b/org.eclipse.jgit.test/.gitignore index 934e0e06ff..561cf84a1b 100644 --- a/org.eclipse.jgit.test/.gitignore +++ b/org.eclipse.jgit.test/.gitignore @@ -1,2 +1,3 @@ /bin /target +/bin-tst/ diff --git a/org.eclipse.jgit.test/build.properties b/org.eclipse.jgit.test/build.properties index e7b3b9978e..7dc26c0b0d 100644 --- a/org.eclipse.jgit.test/build.properties +++ b/org.eclipse.jgit.test/build.properties @@ -4,6 +4,8 @@ source.. = tst/,\ src/ bin.includes = META-INF/,\ .,\ - plugin.properties + plugin.properties,\ + bin-tst/,\ + bin/ additional.bundles = org.apache.log4j,\ org.slf4j.impl.log4j12 -- 2.39.5