aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Thoms2018-05-09 05:29:07 -0400
committerAlexander Kurtakov2018-06-12 08:50:18 -0400
commit5a2e434f6c3a69fd7a874e48b12fb70ed39177dd (patch)
tree2ce747b1913638ab9251efb4714d7692a53c529b
parent11220810cd730fdaefb991c18cbbb822fb8d29c4 (diff)
downloadeclipse.platform.releng.aggregator-5a2e434f6c3a69fd7a874e48b12fb70ed39177dd.tar.gz
eclipse.platform.releng.aggregator-5a2e434f6c3a69fd7a874e48b12fb70ed39177dd.tar.xz
eclipse.platform.releng.aggregator-5a2e434f6c3a69fd7a874e48b12fb70ed39177dd.zip
Bug 534492 - Dynamic arg line for tycho-surefire-plugin
- automatic adding of '-XstartOnFirstThread' on macOS - automatic adding of '--add-modules=ALL-SYSTEM' on Java 9+ - placeholder properties for additional arguments Change-Id: I38015fd29acc9193f47427d95c65c65c9a661339 Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
-rw-r--r--eclipse-platform-parent/pom.xml38
1 files changed, 38 insertions, 0 deletions
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 81004938..65f4a329 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -152,6 +152,19 @@
<compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>
+ <!--
+ Declaration of properties that contribute to the arg line for the tycho-surefire-plugin.
+ The properties are declared empty by default and are overridden by automatic activation
+ of the profiles 'macos' and 'jdk9-or-newer' or specific configuration in modules.
+ -->
+ <!-- any additional surefire args; to be defined by a test-plugin -->
+ <surefire.testArgLine></surefire.testArgLine>
+ <!-- platform/OS specific JVM args -->
+ <surefire.platformSystemProperties></surefire.platformSystemProperties>
+ <!-- properties related to Java modules on Java 9+ -->
+ <surefire.moduleProperties></surefire.moduleProperties>
+ <!-- system specific JVM args; if needed provided by system properties to the build command -->
+ <surefire.systemProperties></surefire.systemProperties>
</properties>
<organization>
@@ -510,6 +523,9 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<version>${tycho.version}</version>
+ <configuration>
+ <argLine>${surefire.testArgLine} ${surefire.platformSystemProperties} ${surefire.systemProperties} ${surefire.moduleProperties}</argLine>
+ </configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
@@ -967,5 +983,27 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>macos</id>
+ <activation>
+ <os>
+ <family>mac</family>
+ </os>
+ </activation>
+ <properties>
+ <surefire.platformSystemProperties>-XstartOnFirstThread</surefire.platformSystemProperties>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>jdk9-or-newer</id>
+ <activation>
+ <jdk>[9,)</jdk>
+ </activation>
+ <properties>
+ <surefire.moduleProperties>--add-modules=ALL-SYSTEM</surefire.moduleProperties>
+ </properties>
+ </profile>
</profiles>
</project>