Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Ufimtsev2017-07-05 09:47:43 -0400
committerLeo Ufimtsev2017-07-10 16:24:02 -0400
commit2f5dd1c291f9d93fe8a19be2393423b0f39d488f (patch)
tree6cce9283481c2b3a9a3903d163c16d6954932caa
parentb31430ea5c9b0164d544b764a36b6586713c97b6 (diff)
downloadeclipse.platform.swt-2f5dd1c291f9d93fe8a19be2393423b0f39d488f.tar.gz
eclipse.platform.swt-2f5dd1c291f9d93fe8a19be2393423b0f39d488f.tar.xz
eclipse.platform.swt-2f5dd1c291f9d93fe8a19be2393423b0f39d488f.zip
Bug 519237 [Cocoa] mvn -Pbuild-individual-bundles fails on OSX due to
missing -XstartOnFirstThread vm arg Adding missing argument for maven test execution. See bug submission for details. Change-Id: Ie6faf2b22afc537373984388684646d6b7054b42 Signed-off-by: Leo Ufimtsev <lufimtse@redhat.com>
-rw-r--r--pom.xml4
-rw-r--r--tests/org.eclipse.swt.tests.cocoa/pom.xml1
-rw-r--r--tests/org.eclipse.swt.tests/pom.xml2
3 files changed, 6 insertions, 1 deletions
diff --git a/pom.xml b/pom.xml
index f53e258530..8d3e13597c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,7 @@
<properties>
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/platform/eclipse.platform.swt.git</tycho.scmUrl>
+ <os-jvm-flags></os-jvm-flags>
</properties>
<!--
@@ -76,6 +77,9 @@
<modules>
<module>tests/org.eclipse.swt.tests.cocoa</module>
</modules>
+ <properties>
+ <os-jvm-flags>-XstartOnFirstThread</os-jvm-flags>
+ </properties>
</profile>
<profile>
<id>unix</id>
diff --git a/tests/org.eclipse.swt.tests.cocoa/pom.xml b/tests/org.eclipse.swt.tests.cocoa/pom.xml
index 575336c227..b0b2a8e902 100644
--- a/tests/org.eclipse.swt.tests.cocoa/pom.xml
+++ b/tests/org.eclipse.swt.tests.cocoa/pom.xml
@@ -49,6 +49,7 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
+ <!-- When adding a test suite in the future, make sure to specify os-jvm-flags in argLine. See swt.tests pom.xml -->
<skipTests>true</skipTests> <!-- Skip all tests on build servers, because it contains platform specific code -->
</configuration>
</plugin>
diff --git a/tests/org.eclipse.swt.tests/pom.xml b/tests/org.eclipse.swt.tests/pom.xml
index 8378292a5c..055ca7c3fd 100644
--- a/tests/org.eclipse.swt.tests/pom.xml
+++ b/tests/org.eclipse.swt.tests/pom.xml
@@ -64,7 +64,7 @@
<phase>integration-test</phase>
<configuration>
<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
- <argLine>@{tycho.testArgLine} -Dorg.eclipse.swt.internal.gtk.disablePrinting -Dorg.eclipse.swt.browser.DefaultType=webkit</argLine>
+ <argLine>@{tycho.testArgLine} -Dorg.eclipse.swt.internal.gtk.disablePrinting -Dorg.eclipse.swt.browser.DefaultType=webkit ${os-jvm-flags}</argLine>
</configuration>
</execution>
</executions>

Back to the top