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 <thomas.wolf@paranor.ch>

diff --git a/org.eclipse.jgit.junit/.classpath b/org.eclipse.jgit.junit/.classpath
index 3e5654f17eb32b3855f57c6ac4d78bf51062a335..eca7bdba8f03f22510b7980a94dbfe10c16c0901 100644 (file)
--- a/org.eclipse.jgit.junit/.classpath
+++ b/org.eclipse.jgit.junit/.classpath
@@ -2,10 +2,6 @@
 <classpath>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="src" path="src">
-               <attributes>
-                       <attribute name="test" value="true"/>
-               </attributes>
-       </classpathentry>
+       <classpathentry kind="src" path="src"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/org.eclipse.jgit.test/.classpath b/org.eclipse.jgit.test/.classpath
index 3b0dd26bc5aee120181cc0545dc81f66a2aaa011..3a0a10e33c932d4ed2e5860409d63712a3705d70 100644 (file)
--- a/org.eclipse.jgit.test/.classpath
+++ b/org.eclipse.jgit.test/.classpath
@@ -1,21 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry excluding="**/*.idx|**/*.pack" kind="src" path="tst">
+       <classpathentry excluding="**/*.idx|**/*.pack" kind="src" path="tst" output="bin-tst">
                <attributes>
                        <attribute name="test" value="true"/>
                </attributes>
        </classpathentry>
-       <classpathentry kind="src" path="src">
+       <classpathentry kind="src" path="src"/>
+       <classpathentry kind="src" path="tst-rsrc" output="bin-tst">
                <attributes>
                        <attribute name="test" value="true"/>
                </attributes>
        </classpathentry>
-       <classpathentry kind="src" path="tst-rsrc">
-               <attributes>
-                       <attribute name="test" value="true"/>
-               </attributes>
-       </classpathentry>
-       <classpathentry kind="src" path="exttst">
+       <classpathentry kind="src" path="exttst" output="bin-tst">
                <attributes>
                        <attribute name="test" value="true"/>
                </attributes>

diff --git a/org.eclipse.jgit.test/.gitignore b/org.eclipse.jgit.test/.gitignore
index 934e0e06ffa0a2aeedbe1341d321549336719cc0..561cf84a1b859929769990db7f3095775fa67c6f 100644 (file)
--- 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 e7b3b9978ecafc0d7b321527be9a5a20946c512d..7dc26c0b0da55a9fea65d0f300cf1be8ee6717a8 100644 (file)
--- 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