Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2010-04-23 13:51:14 -0400
committerStephan Herrmann2010-04-23 13:51:14 -0400
commit90988d1515dc1bf1d87892cee46d12cc96153a7e (patch)
treec3725214047b45f2bdb4f7bf0cfc3980b0e966b8
parent7b84a8b928bc5576712b7d678bc2ec10bc322cdd (diff)
downloadorg.eclipse.objectteams-90988d1515dc1bf1d87892cee46d12cc96153a7e.tar.gz
org.eclipse.objectteams-90988d1515dc1bf1d87892cee46d12cc96153a7e.tar.xz
org.eclipse.objectteams-90988d1515dc1bf1d87892cee46d12cc96153a7e.zip
try to not build test.performance and ant.optional.junit from CVS but include these from the test framework.
was: failure to install test.performance, perhaps due to duplication.
-rw-r--r--features/org.eclipse.objectteams.otdt.feature/unit-tests-feature/feature.xml15
-rw-r--r--releng/map/otdt.map4
2 files changed, 4 insertions, 15 deletions
diff --git a/features/org.eclipse.objectteams.otdt.feature/unit-tests-feature/feature.xml b/features/org.eclipse.objectteams.otdt.feature/unit-tests-feature/feature.xml
index ab133ac5f..867f40eb9 100644
--- a/features/org.eclipse.objectteams.otdt.feature/unit-tests-feature/feature.xml
+++ b/features/org.eclipse.objectteams.otdt.feature/unit-tests-feature/feature.xml
@@ -41,21 +41,10 @@ This software is based on Eclipse and the Java Development Tooling
<import plugin="org.eclipse.jdt.debug"/>
<import plugin="org.eclipse.team.core"/>
<import plugin="org.eclipse.text"/>
+ <import plugin="org.eclipse.test.performance"/>
+ <import plugin="org.eclipse.ant.optional.junit"/>
</requires>
-
- <plugin
- id="org.eclipse.test.performance"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.ant.optional.junit"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
<plugin
id="org.eclipse.jdt.core.tests.compiler"
download-size="0"
diff --git a/releng/map/otdt.map b/releng/map/otdt.map
index e72967cbf..6bb70b2d7 100644
--- a/releng/map/otdt.map
+++ b/releng/map/otdt.map
@@ -54,10 +54,10 @@ plugin@org.eclipse.objectteams.otdt.ui.tests.refactoring,0.7.0=SVN,url=svn://loc
!plugin@org.eclipse.jdt.debug.tests=SVN,url=svn://localhost/svnroot/tools/org.eclipse.objectteams/,path=testplugins/org.eclipse.jdt.debug.tests
!-- .. but from original CVS:
-plugin@org.eclipse.test.performance=v20100122,/cvsroot/eclipse,
+!plugin@org.eclipse.test.performance=v20100122,/cvsroot/eclipse,
plugin@org.eclipse.jdt.core.tests.builder=v_A45,/cvsroot/eclipse,
plugin@org.eclipse.jdt.debug.tests=v20100322,/cvsroot/eclipse,
-plugin@org.eclipse.ant.optional.junit=v20080717,/cvsroot/eclipse,
+!plugin@org.eclipse.ant.optional.junit=v20080717,/cvsroot/eclipse,

Back to the top