diff options
| author | Uwe Stieber | 2012-03-09 11:23:37 +0000 |
|---|---|---|
| committer | Uwe Stieber | 2012-03-09 11:23:37 +0000 |
| commit | 5486823e0154460f8f9b0519fa1c8c9a2de82df5 (patch) | |
| tree | 6ced234043713e2e237a2bf9479c5dbc14e23cc6 | |
| parent | c1484e8b4c49c502429fb9e4a7c9180d1141fcea (diff) | |
| download | org.eclipse.tcf-5486823e0154460f8f9b0519fa1c8c9a2de82df5.tar.gz org.eclipse.tcf-5486823e0154460f8f9b0519fa1c8c9a2de82df5.tar.xz org.eclipse.tcf-5486823e0154460f8f9b0519fa1c8c9a2de82df5.zip | |
Maven: Move unit tests from default build profile into a separate profile
| -rw-r--r-- | admin/pom-build.xml | 13 | ||||
| -rw-r--r-- | pom-tests.xml | 24 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml | 85 |
4 files changed, 50 insertions, 74 deletions
diff --git a/admin/pom-build.xml b/admin/pom-build.xml index 145ce4a5a..f565d9be6 100644 --- a/admin/pom-build.xml +++ b/admin/pom-build.xml @@ -47,18 +47,5 @@ </plugins> </build> </profile> - - <profile> - <id>coverage</id> - - <build> - <plugins> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> </profiles> </project> diff --git a/pom-tests.xml b/pom-tests.xml deleted file mode 100644 index 50a0670d9..000000000 --- a/pom-tests.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.eclipse.tcf</groupId> - <artifactId>org.eclipse.tcf.maven-build</artifactId> - <version>1.0.0-SNAPSHOT</version> - <relativePath>admin/pom-build.xml</relativePath> - </parent> - - <groupId>org.eclipse.tcf</groupId> - <artifactId>tcf-tests-parent</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>TCF and Target Explorer, Unit Tests Master</name> - - <modules> - <module>target_explorer/plugins/org.eclipse.tcf.te.tests</module> - </modules> - -</project>
\ No newline at end of file @@ -79,5 +79,7 @@ <module>target_explorer/features/org.eclipse.tcf.te.tcf.sdk.feature</module> <module>features/org.eclipse.tcf.repo</module> + + <module>target_explorer/plugins/org.eclipse.tcf.te.tests</module> </modules> </project> 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 1584ec243..0b7735d91 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml +++ b/target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml @@ -6,50 +6,61 @@ <parent> <groupId>org.eclipse.tcf</groupId> - <artifactId>tcf-tests-parent</artifactId> + <artifactId>tcf-parent</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../../../pom-tests.xml</relativePath> + <relativePath>../../../pom.xml</relativePath> </parent> <version>1.0.0.qualifier</version> <artifactId>org.eclipse.tcf.te.tests</artifactId> <packaging>eclipse-test-plugin</packaging> - <properties> - <sdk-version>3.8.0</sdk-version> - <te-version>1.0.0</te-version> + <profiles> + <profile> + <id>run-tests</id> + + <properties> + <sdk-version>3.8.0</sdk-version> + <te-version>1.0.0</te-version> - <ui.test.vmargs>-Xmx512m -XX:MaxPermSize=256m</ui.test.vmargs> - </properties> + <ui.test.vmargs>-Xmx512m -XX:MaxPermSize=256m</ui.test.vmargs> + </properties> - <build> - <plugins> - <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.AllCoreTests</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> - <dependencies> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.sdk.feature.group</artifactId> - <version>${sdk-version}</version> - </dependency> - <dependency> - <type>p2-installable-unit</type> - <artifactId>org.eclipse.tcf.te.feature.feature.group</artifactId> - <version>${te-version}</version> - </dependency> - </dependencies> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + </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.AllCoreTests</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> + <dependencies> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.eclipse.sdk.feature.group</artifactId> + <version>${sdk-version}</version> + </dependency> + <dependency> + <type>p2-installable-unit</type> + <artifactId>org.eclipse.tcf.te.feature.feature.group</artifactId> + <version>${te-version}</version> + </dependency> + </dependencies> + </configuration> + </plugin> + </plugins> + </build> + + </profile> + </profiles> </project> |