Skip to content

Commit 44e7af8

Browse files
committed
Avoid need for dedicate product definitions for pde.build.tests
Instead of own complete product definitions just use the existing o.e.platform.ide product and install all additionally required IUs while tycho-surefire assembles the test-runtime. In an earlier state the test-runtime was just provisioned from the 'o.e.sdk.ide' product, which had the drawback, that it included the o.e.pde feature from the latest I-build and not the one just built in the Maven reactor. Instead of the 'o.e.sdk.ide' product, now 'o.e.platform.ide' is used as base product. The latter doesn't contain the o.e.pde feature, which allows us to install it from the reactor when tycho-surefire assembles the test-runtime. Follow-up on - #1149
1 parent 890d7aa commit 44e7af8

File tree

3 files changed

+21
-97
lines changed

3 files changed

+21
-97
lines changed

build/org.eclipse.pde.build.tests/pom.xml

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,6 @@
9898
</execution>
9999
</executions>
100100
</plugin>
101-
<plugin>
102-
<groupId>org.eclipse.tycho</groupId>
103-
<artifactId>tycho-p2-publisher-plugin</artifactId>
104-
<version>${tycho.version}</version>
105-
<executions>
106-
<execution>
107-
<id>publish-products</id>
108-
<goals>
109-
<goal>publish-products</goal>
110-
</goals>
111-
<phase>pre-integration-test</phase>
112-
</execution>
113-
</executions>
114-
</plugin>
115101
<plugin>
116102
<groupId>org.eclipse.tycho</groupId>
117103
<artifactId>tycho-surefire-plugin</artifactId>
@@ -127,7 +113,27 @@
127113
</repositories>
128114
<install>
129115
<iu>
130-
<id>org.eclipse.sdk.test.ide</id>
116+
<id>org.eclipse.platform.ide</id>
117+
</iu>
118+
<iu>
119+
<id>org.eclipse.pde</id>
120+
<feature>true</feature>
121+
</iu>
122+
<iu>
123+
<id>org.eclipse.tips.feature</id>
124+
<feature>true</feature>
125+
</iu>
126+
<iu>
127+
<id>org.eclipse.test</id>
128+
<feature>true</feature>
129+
</iu>
130+
<!-- Needed by org.eclipse.pde.build.internal.tests.p2.PublishingTests.testBug329162() -->
131+
<iu>
132+
<id>org.eclipse.osgi.source</id>
133+
</iu>
134+
<!-- Needed by org.eclipse.pde.build.internal.tests.SourceTests.testBug290828() -->
135+
<iu>
136+
<id>org.eclipse.team.core.source</id>
131137
</iu>
132138
</install>
133139
</configuration>

build/org.eclipse.pde.build.tests/test-sdk.product

Lines changed: 0 additions & 62 deletions
This file was deleted.

build/org.eclipse.pde.build.tests/test.product

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)