diff options
| author | Thomas Wolf <thomas.wolf@paranor.ch> | 2018-11-01 13:53:25 +0100 |
|---|---|---|
| committer | Thomas Wolf <thomas.wolf@paranor.ch> | 2018-11-02 18:50:26 +0100 |
| commit | bb5180469c77ad935f7d3d49d063eb172d57e3ea (patch) | |
| tree | b361fab4e5a155e1ad2c206149120a5c2eba9a94 /org.eclipse.jgit.test | |
| parent | 9175099e48ee5a443feaa692dfa725d84ee21282 (diff) | |
| download | jgit-bb5180469c77ad935f7d3d49d063eb172d57e3ea.tar.gz jgit-bb5180469c77ad935f7d3d49d063eb172d57e3ea.zip | |
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>
Diffstat (limited to 'org.eclipse.jgit.test')
| -rw-r--r-- | org.eclipse.jgit.test/.classpath | 12 | ||||
| -rw-r--r-- | org.eclipse.jgit.test/.gitignore | 1 | ||||
| -rw-r--r-- | org.eclipse.jgit.test/build.properties | 4 |
3 files changed, 8 insertions, 9 deletions
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 @@ <?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 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 |