diff options
| -rw-r--r-- | admin/pom-build.xml | 111 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml | 32 | ||||
| -rw-r--r-- | tests/plugins/org.eclipse.tcf.debug.test/pom.xml | 26 |
4 files changed, 92 insertions, 79 deletions
diff --git a/admin/pom-build.xml b/admin/pom-build.xml index 0987b6e5b..791dc48e1 100644 --- a/admin/pom-build.xml +++ b/admin/pom-build.xml @@ -80,6 +80,72 @@ <build> <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <configuration> + <dependency-resolution> + <extraRequirements> + <!-- product IU under test --> + <requirement> + <type>p2-installable-unit</type> + <id>org.eclipse.platform.ide</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.sdk</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.remote</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.swtbot.eclipse</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.tcf.core.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.tcf.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.tcf.cdt.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.tcf.te.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.tcf.te.tcf.core.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.tcf.te.tcf.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <type>eclipse-feature</type> + <id>org.eclipse.tcf.te.tcf.remote.feature</id> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> @@ -103,50 +169,5 @@ </plugins> </build> </profile> - - <profile> - <id>validate</id> - <!-- The validate profile does work only inside the WR network. --> - <!-- The profile requires a custom plug-in to generate the validation report --> - - <pluginRepositories> - <pluginRepository> - <id>wr</id> - <url>http://szg-bld-wb.wrs.com/wb-sd/maven/</url> - <snapshots> - <enabled>true</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - </pluginRepository> - </pluginRepositories> - - <build> - <plugins> - <plugin> - <groupId>com.windriver.tycho-ext</groupId> - <artifactId>manifest-validation-plugin</artifactId> - <version>1.0.3</version> - <executions> - <execution> - <id>clean</id> - <phase>clean</phase> - <goals> - <goal>clean</goal> - </goals> - </execution> - <execution> - <id>validate</id> - <phase>validate</phase> - <goals> - <goal>validate-required-bundle-versions</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> @@ -108,9 +108,7 @@ <modules> <module>target_explorer/plugins/org.eclipse.tcf.te.tests</module> - <!-- <module>tests/plugins/org.eclipse.tcf.debug.test</module> - --> </modules> </profile> </profiles> diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml b/target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml index 9c58b314f..010875e1b 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml +++ b/target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml @@ -28,31 +28,18 @@ <build> <plugins> <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>target-platform-configuration</artifactId> - <configuration> - <dependency-resolution> - <extraRequirements> - <requirement> - <type>eclipse-feature</type> - <id>org.eclipse.sdk</id> - <versionRange>0.0.0</versionRange> - </requirement> - </extraRequirements> - </dependency-resolution> - </configuration> - </plugin> - - <plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire-plugin</artifactId> <version>${tycho-version}</version> <configuration> - <testSuite>org.eclipse.tcf.te.tests</testSuite> - <testClass>org.eclipse.tcf.te.tests.suites.AllTests</testClass> <useUIHarness>true</useUIHarness> <useUIThread>true</useUIThread> + <product>org.eclipse.platform.ide</product> + <argLine>${tycho.testArgLine} ${ui.test.vmargs}</argLine> + <application>org.eclipse.ui.ide.workbench</application> + <testFailureIgnore>true</testFailureIgnore> <showEclipseLog>true</showEclipseLog> + <testRuntime>p2Installed</testRuntime> <!-- <debugPort>8003</debugPort> --> @@ -61,11 +48,10 @@ <osgi.debug>${basedir}/tracing/.options</osgi.debug> <tcf.agent.path>${basedir}/.agent/agent</tcf.agent.path> </systemProperties> - <product>org.eclipse.platform.ide</product> - <argLine>${tycho.testArgLine} ${ui.test.vmargs}</argLine> - <testFailureIgnore>true</testFailureIgnore> - <application>org.eclipse.ui.ide.workbench</application> - </configuration> + + <testSuite>org.eclipse.tcf.te.tests</testSuite> + <testClass>org.eclipse.tcf.te.tests.suites.AllTests</testClass> + </configuration> </plugin> <plugin> diff --git a/tests/plugins/org.eclipse.tcf.debug.test/pom.xml b/tests/plugins/org.eclipse.tcf.debug.test/pom.xml index 005b03970..f183034b6 100644 --- a/tests/plugins/org.eclipse.tcf.debug.test/pom.xml +++ b/tests/plugins/org.eclipse.tcf.debug.test/pom.xml @@ -32,6 +32,23 @@ <artifactId>tycho-surefire-plugin</artifactId> <version>${tycho-version}</version> <configuration> + <useUIHarness>true</useUIHarness> + <useUIThread>false</useUIThread> + <product>org.eclipse.platform.ide</product> + <argLine>${tycho.testArgLine} ${ui.test.vmargs}</argLine> + <application>org.eclipse.ui.ide.workbench</application> + <testFailureIgnore>true</testFailureIgnore> + <showEclipseLog>true</showEclipseLog> + <testRuntime>p2Installed</testRuntime> + <!-- + <debugPort>8003</debugPort> + --> + + <systemProperties> + <osgi.debug>${basedir}/tracing/.options</osgi.debug> + <tcf.agent.path>${basedir}/.agent/agent</tcf.agent.path> + </systemProperties> + <includes> <include>**/BreakpointsTest.*</include> <include>**/TransactionTests.*</include> @@ -44,15 +61,6 @@ <include>**/QueryTests.*</include> <include>**/RangeCacheTests.*</include> </includes> - <!-- - <debugPort>8003</debugPort> - --> - <useUIHarness>true</useUIHarness> - <useUIThread>false</useUIThread> - <product>org.eclipse.platform.ide</product> - <argLine>${tycho.testArgLine} ${ui.test.vmargs}</argLine> - <testFailureIgnore>true</testFailureIgnore> - <application>org.eclipse.ui.ide.workbench</application> </configuration> </plugin> |