Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcbrun2016-01-29 14:52:49 +0000
committerPierre-Charles David2016-02-19 12:49:32 +0000
commit01f8f387b443ff89a75d47e9d90a128972586c4f (patch)
tree311298c0b155851412b175243d39fadd0de4f4c4 /packaging
parent3000b64e4b340c905ed62f247dbf386cf29cdcdf (diff)
downloadorg.eclipse.sirius-01f8f387b443ff89a75d47e9d90a128972586c4f.tar.gz
org.eclipse.sirius-01f8f387b443ff89a75d47e9d90a128972586c4f.tar.xz
org.eclipse.sirius-01f8f387b443ff89a75d47e9d90a128972586c4f.zip
[478878] Merge the code and Test builds
Include the tests and their configuration into the base Maven build. Remove the "test specific" targets platforms and update the "build" target platform to include UML2. The test specific build org.eclipse.sirius.tests.parent is not removed but is made empty in order to be able to have Jenkins/hudson jobs which can indiferently launch one layout or the other. Bug: 478878 Change-Id: I9472ab5ee6a5d631cf054d5f809609d7567bec3d Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
Diffstat (limited to 'packaging')
-rw-r--r--packaging/org.eclipse.sirius.parent/pom.xml185
-rw-r--r--packaging/org.eclipse.sirius.tests.parent/pom.xml51
-rw-r--r--packaging/org.eclipse.sirius.tests.update/pom.xml4
-rw-r--r--packaging/org.eclipse.sirius.tests/pom.xml4
4 files changed, 183 insertions, 61 deletions
diff --git a/packaging/org.eclipse.sirius.parent/pom.xml b/packaging/org.eclipse.sirius.parent/pom.xml
index 219ded73da..7054338d0f 100644
--- a/packaging/org.eclipse.sirius.parent/pom.xml
+++ b/packaging/org.eclipse.sirius.parent/pom.xml
@@ -41,8 +41,41 @@
<platform-version-name>mars</platform-version-name>
<target-platform-path>.</target-platform-path>
<tycho.scmUrl>scm:git:http://git.eclipse.org/gitroot/sirius/org.eclipse.sirius.git</tycho.scmUrl>
+ <tests.skipLongTests>false</tests.skipLongTests>
+ <tests.skipUnreliableTests>false</tests.skipUnreliableTests>
+ <tests.timeout>0</tests.timeout>
+ <tests.vmargs.mac />
+ <tests.junit.skip>true</tests.junit.skip>
+ <tests.swtbot.skip>true</tests.swtbot.skip>
+ <tests.junit.include />
+ <tests.swtbot.include />
+ <tests.swtbot-sequence.include />
+ <tests.ignoreFailures>true</tests.ignoreFailures>
</properties>
+<!--Add specific repositories, pluginRepositories and dependencies for Acceleo3 compilation. See http://wiki.eclipse.org/Acceleo/Maven for more details. -->
+ <repositories>
+ <repository>
+ <id>Indigo Release</id>
+ <url>http://www.obeo.fr/download/acceleo/maven/releases/indigo</url>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>Indigo Release</id>
+ <url>http://www.obeo.fr/download/acceleo/maven/releases/indigo</url>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.eclipse.acceleo</groupId>
+ <artifactId>maven</artifactId>
+ <version>3.2.1</version>
+ </dependency>
+ </dependencies>
+
<modules>
<!-- All modules are contributed by specific profiles, see below. -->
</modules>
@@ -220,8 +253,22 @@
<configuration>
<defaultP2Metadata>false</defaultP2Metadata>
</configuration>
- </plugin>
- </plugins>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.acceleo</groupId>
+ <artifactId>maven</artifactId>
+ <version>3.2.1</version>
+ <executions>
+ <execution>
+ <id>acceleo-compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>acceleo-compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</pluginManagement>
</build>
@@ -330,9 +377,36 @@
<!-- update sites -->
<module>../../packaging/org.eclipse.sirius.update</module>
- </modules>
- </profile>
- <profile>
+
+ <!-- Test metamodels and modelers -->
+ <module>../../plugins/org.eclipse.sirius.sample.ecore.design</module>
+ <module>../../plugins/org.eclipse.sirius.sample.interactions</module>
+ <module>../../plugins/org.eclipse.sirius.sample.interactions.design</module>
+ <module>../../plugins/org.eclipse.sirius.sample.interactions.edit</module>
+ <module>../../plugins/org.eclipse.sirius.sample.interactions.editor</module>
+ <module>../../plugins/org.eclipse.sirius.tests.sample.benchmark</module>
+ <module>../../plugins/org.eclipse.sirius.tests.sample.docbook</module>
+ <module>../../plugins/org.eclipse.sirius.tests.sample.docbook.design</module>
+ <module>../../plugins/org.eclipse.sirius.tests.sample.docbook.edit</module>
+ <module>../../plugins/org.eclipse.sirius.tests.sample.docbook.editor</module>
+ <module>../../plugins/org.eclipse.sirius.tests.sample.migration</module>
+ <module>../../plugins/org.eclipse.sirius.tests.sample.migration.design</module>
+ <module>../../plugins/org.eclipse.sirius.tests.sample.component</module>
+ <module>../../plugins/org.eclipse.sirius.tests.sample.component.design</module>
+ <module>../../plugins/org.eclipse.sirius.tests.sample.scxml</module>
+ <module>../../plugins/org.eclipse.sirius.tests.sample.scxml.design</module>
+ <module>../../plugins/org.eclipse.sirius.tests.junit</module>
+ <module>../../plugins/org.eclipse.sirius.tests.tree</module>
+ <module>../../plugins/org.eclipse.sirius.tests.swtbot</module>
+ <!-- features -->
+ <module>../../packaging/org.eclipse.sirius.tests</module>
+
+ <!-- update sites -->
+ <module>../../packaging/org.eclipse.sirius.tests.update</module>
+
+ </modules>
+</profile>
+<profile>
<id>incubation</id>
<activation>
<activeByDefault>true</activeByDefault>
@@ -420,5 +494,104 @@
</pluginRepository>
</pluginRepositories>
</profile>
- </profiles>
+ <profile>
+ <id>junit</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <tests.junit.skip>false</tests.junit.skip>
+ <tests.timeout>${tests.timeout.junit}</tests.timeout>
+ <tests.junit.include>org/eclipse/sirius/tests/suite/AllSiriusTestSuite.java, org/eclipse/sirius/tests/suite/tree/AllSiriusTestSuite.java</tests.junit.include>
+ <tests.vmargs>${tests.vmargs.mac} -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+ </properties>
+ </profile>
+ <profile>
+ <id>gerrit-junit</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <tests.junit.skip>false</tests.junit.skip>
+ <tests.timeout>${tests.timeout.junit}</tests.timeout>
+ <tests.junit.include>org/eclipse/sirius/tests/suite/GerritJUnitSuite.java, org/eclipse/sirius/tests/suite/tree/AllSiriusTestSuite.java</tests.junit.include>
+ <tests.vmargs>${tests.vmargs.mac} -Xmx1024m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+ <tests.ignoreFailures>false</tests.ignoreFailures>
+ </properties>
+ </profile>
+ <profile>
+ <id>swtbot</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <tests.swtbot.skip>false</tests.swtbot.skip>
+ <tests.timeout>${tests.timeout.swtbot}</tests.timeout>
+ <tests.swtbot.include>org/eclipse/sirius/tests/swtbot/suite/AllTestSuite.java</tests.swtbot.include>
+ <tests.vmargs>${tests.vmargs.mac} -Xmx2048m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+ </properties>
+ </profile>
+ <profile>
+ <id>swtbot-part1</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <tests.swtbot.skip>false</tests.swtbot.skip>
+ <tests.timeout>${tests.timeout.swtbot}</tests.timeout>
+ <tests.swtbot.include>org/eclipse/sirius/tests/swtbot/suite/SWTBotPart1Suite.java</tests.swtbot.include>
+ <tests.vmargs>${tests.vmargs.mac} -Xmx2048m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+ </properties>
+ </profile>
+ <profile>
+ <id>swtbot-part2</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <tests.swtbot.skip>false</tests.swtbot.skip>
+ <tests.timeout>${tests.timeout.swtbot}</tests.timeout>
+ <tests.swtbot.include>org/eclipse/sirius/tests/swtbot/suite/SWTBotPart2Suite.java</tests.swtbot.include>
+ <tests.vmargs>${tests.vmargs.mac} -Xmx2048m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+ </properties>
+ </profile>
+ <profile>
+ <id>gerrit-swtbot</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <tests.swtbot.skip>false</tests.swtbot.skip>
+ <tests.timeout>${tests.timeout.swtbot}</tests.timeout>
+ <tests.swtbot.include>org/eclipse/sirius/tests/swtbot/suite/GerritSWTBotSuite.java</tests.swtbot.include>
+ <tests.vmargs>${tests.vmargs.mac} -Xmx2048m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+ <tests.ignoreFailures>false</tests.ignoreFailures>
+ </properties>
+ </profile>
+ <profile>
+ <id>swtbot-sequence</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <tests.swtbot.skip>false</tests.swtbot.skip>
+ <tests.timeout>${tests.timeout.swtbot-sequence}</tests.timeout>
+ <tests.swtbot-sequence.include>org/eclipse/sirius/tests/swtbot/suite/SequenceSwtBotTestSuite.java</tests.swtbot-sequence.include>
+ <tests.vmargs>${tests.vmargs.mac} -Xmx2048m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+ </properties>
+ </profile>
+ <profile>
+ <id>gerrit-swtbot-sequence</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <tests.swtbot.skip>false</tests.swtbot.skip>
+ <tests.timeout>${tests.timeout.swtbot-sequence}</tests.timeout>
+ <tests.swtbot-sequence.include>org/eclipse/sirius/tests/swtbot/suite/GerritSequenceSWTBotSuite.java</tests.swtbot-sequence.include>
+ <tests.vmargs>${tests.vmargs.mac} -Xmx2048m -XX:MaxPermSize=256m -XX:+HeapDumpOnOutOfMemoryError</tests.vmargs>
+ <tests.ignoreFailures>false</tests.ignoreFailures>
+ </properties>
+ </profile>
+ </profiles>
</project>
diff --git a/packaging/org.eclipse.sirius.tests.parent/pom.xml b/packaging/org.eclipse.sirius.tests.parent/pom.xml
index f1b4643466..8026e3633a 100644
--- a/packaging/org.eclipse.sirius.tests.parent/pom.xml
+++ b/packaging/org.eclipse.sirius.tests.parent/pom.xml
@@ -59,58 +59,7 @@
<tests.ignoreFailures>true</tests.ignoreFailures>
</properties>
- <modules>
- <!-- Test metamodels and modelers -->
- <module>../../plugins/org.eclipse.sirius.sample.ecore.design</module>
- <module>../../plugins/org.eclipse.sirius.sample.interactions</module>
- <module>../../plugins/org.eclipse.sirius.sample.interactions.design</module>
- <module>../../plugins/org.eclipse.sirius.sample.interactions.edit</module>
- <module>../../plugins/org.eclipse.sirius.sample.interactions.editor</module>
- <module>../../plugins/org.eclipse.sirius.tests.sample.benchmark</module>
- <module>../../plugins/org.eclipse.sirius.tests.sample.docbook</module>
- <module>../../plugins/org.eclipse.sirius.tests.sample.docbook.design</module>
- <module>../../plugins/org.eclipse.sirius.tests.sample.docbook.edit</module>
- <module>../../plugins/org.eclipse.sirius.tests.sample.docbook.editor</module>
- <module>../../plugins/org.eclipse.sirius.tests.sample.migration</module>
- <module>../../plugins/org.eclipse.sirius.tests.sample.migration.design</module>
- <module>../../plugins/org.eclipse.sirius.tests.sample.component</module>
- <module>../../plugins/org.eclipse.sirius.tests.sample.component.design</module>
- <module>../../plugins/org.eclipse.sirius.tests.sample.scxml</module>
- <module>../../plugins/org.eclipse.sirius.tests.sample.scxml.design</module>
- <module>../../plugins/org.eclipse.sirius.tests.junit</module>
- <module>../../plugins/org.eclipse.sirius.tests.tree</module>
- <module>../../plugins/org.eclipse.sirius.tests.swtbot</module>
- <!-- features -->
- <module>../../packaging/org.eclipse.sirius.tests</module>
-
- <!-- update sites -->
- <module>../../packaging/org.eclipse.sirius.tests.update</module>
- </modules>
-
<build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <includePackedArtifacts>true</includePackedArtifacts>
- <resolver>p2</resolver>
- <dependency-resolution>
- <optionalDependencies>ignore</optionalDependencies>
- </dependency-resolution>
- <target>
- <artifact>
- <groupId>org.eclipse.sirius</groupId>
- <artifactId>sirius-tests-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <classifier>../../releng/org.eclipse.sirius.targets/sirius_tests_${platform-version-name}</classifier>
- </artifact>
- </target>
- </configuration>
- </plugin>
- </plugins>
-
<pluginManagement>
<plugins>
<plugin>
diff --git a/packaging/org.eclipse.sirius.tests.update/pom.xml b/packaging/org.eclipse.sirius.tests.update/pom.xml
index 76fb4dddfb..1712b18fb2 100644
--- a/packaging/org.eclipse.sirius.tests.update/pom.xml
+++ b/packaging/org.eclipse.sirius.tests.update/pom.xml
@@ -16,9 +16,9 @@
<parent>
<groupId>org.eclipse.sirius</groupId>
- <artifactId>sirius-tests-parent</artifactId>
+ <artifactId>sirius-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+ <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
</parent>
<artifactId>org.eclipse.sirius.tests.update</artifactId>
diff --git a/packaging/org.eclipse.sirius.tests/pom.xml b/packaging/org.eclipse.sirius.tests/pom.xml
index 3947b66e41..15a3e276bd 100644
--- a/packaging/org.eclipse.sirius.tests/pom.xml
+++ b/packaging/org.eclipse.sirius.tests/pom.xml
@@ -16,9 +16,9 @@
<parent>
<groupId>org.eclipse.sirius</groupId>
- <artifactId>sirius-tests-parent</artifactId>
+ <artifactId>sirius-parent</artifactId>
<version>4.0.0-SNAPSHOT</version>
- <relativePath>../../packaging/org.eclipse.sirius.tests.parent</relativePath>
+ <relativePath>../../packaging/org.eclipse.sirius.parent</relativePath>
</parent>
<artifactId>org.eclipse.sirius.tests</artifactId>

Back to the top