Browse Source

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>
stable-5.2
Thomas Wolf 6 years ago
parent
commit
bb5180469c
  1. 6
      org.eclipse.jgit.junit/.classpath
  2. 12
      org.eclipse.jgit.test/.classpath
  3. 1
      org.eclipse.jgit.test/.gitignore
  4. 4
      org.eclipse.jgit.test/build.properties

6
org.eclipse.jgit.junit/.classpath

@ -2,10 +2,6 @@
<classpath> <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.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="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"> <classpathentry kind="src" path="src"/>
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

12
org.eclipse.jgit.test/.classpath

@ -1,21 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry excluding="**/*.idx|**/*.pack" kind="src" path="tst"> <classpathentry excluding="**/*.idx|**/*.pack" kind="src" path="tst" output="bin-tst">
<attributes> <attributes>
<attribute name="test" value="true"/> <attribute name="test" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="src" path="src"> <classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="tst-rsrc" output="bin-tst">
<attributes> <attributes>
<attribute name="test" value="true"/> <attribute name="test" value="true"/>
</attributes> </attributes>
</classpathentry> </classpathentry>
<classpathentry kind="src" path="tst-rsrc"> <classpathentry kind="src" path="exttst" output="bin-tst">
<attributes>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="exttst">
<attributes> <attributes>
<attribute name="test" value="true"/> <attribute name="test" value="true"/>
</attributes> </attributes>

1
org.eclipse.jgit.test/.gitignore vendored

@ -1,2 +1,3 @@
/bin /bin
/target /target
/bin-tst/

4
org.eclipse.jgit.test/build.properties

@ -4,6 +4,8 @@ source.. = tst/,\
src/ src/
bin.includes = META-INF/,\ bin.includes = META-INF/,\
.,\ .,\
plugin.properties plugin.properties,\
bin-tst/,\
bin/
additional.bundles = org.apache.log4j,\ additional.bundles = org.apache.log4j,\
org.slf4j.impl.log4j12 org.slf4j.impl.log4j12

Loading…
Cancel
Save