Commit 3a13f1aa authored by Alexander Diewald's avatar Alexander Diewald

Tests: Integrate into build

* To be triggered with the profile "tests".
* Launch the EMF generator only with the profiles "af3" or "tooling".
* Add the AF3 tests as a submodule.

Issue-Ref: 3620
Issue-Url: https://af3-developer.fortiss.org/issues/3620Signed-off-by: Alexander Diewald's avatarAlexander Diewald <diewald@fortiss.org>
parent d5923f88
......@@ -4,10 +4,13 @@
[submodule "bundles/af3"]
path = bundles/af3
url = https://git.fortiss.org/af3/af3.git
branch = 3620
branch = 3620
fetchRecurseSubmodules = true
[submodule "bundles/kernel"]
path = bundles/kernel
url = https://git.fortiss.org/af3/kernel.git
branch = 3620
branch = 3620
fetchRecurseSubmodules = true
[submodule "tests/af3"]
path = tests/af3
url = https://git.fortiss.org/af3/product-tests.git
......@@ -103,11 +103,6 @@
</plugins>
</build>
<modules>
<module>emf-generator</module>
</modules>
<profiles>
<profile>
<!-- NOTE: tooling plugins are checked out for the build, but are not
......@@ -117,6 +112,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>emf-generator</module>
<module>kernel/org.fortiss.tooling.base</module>
<module>kernel/org.fortiss.tooling.base.ui</module>
<module>kernel/org.fortiss.tooling.common</module>
......@@ -134,6 +130,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>emf-generator</module>
<module>af3/com.microsoft.z3</module>
<module>af3/eu.fbk.af3.tools.diagram</module>
<module>af3/eu.fbk.af3.tools.diagram.ui</module>
......
<project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.fortiss.af3</groupId>
<artifactId>org.fortiss.af3.root</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
......@@ -17,7 +14,7 @@
<module>bundles</module>
<module>features</module>
<module>products</module>
<!--module>tests</module-->
<module>tests</module>
<module>releng</module>
</modules>
</project>
\ No newline at end of file
Subproject commit f7ec6655c762c54eaa5ee5785abba894fb2c031e
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>org.fortiss.af3.tests</artifactId>
<groupId>org.fortiss.af3.tests</groupId>
<packaging>pom</packaging>
<parent>
<groupId>org.fortiss.af3</groupId>
<artifactId>org.fortiss.af3.root</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<profiles>
<profile>
<id>tests</id>
<modules>
<module>af3</module>
</modules>
</profile>
<profile>
<id>af3-p2-local</id>
<activation>
<property>
<name>!af3</name>
</property>
</activation>
<repositories>
<repository>
<!-- Place more centrally and combine with af3 profile -->
<id>af3-p2</id>
<layout>p2</layout>
<!-- In jenkins, the tooling update site must be copied to this location. -->
<url>file:///${user.dir}/releng/org.fortiss.af3.update/target/repository/</url>
</repository>
</repositories>
</profile>
</profiles>
</project>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment