lttng: Fix maven tests on Mac

Cocoa requires the Display to be created on the main thread
so -XstartOnFirstThread needs to be specified in the VM args.
Also use -Dorg.eclipse.swt.internal.carbon.smallFonts to make it
consistent with the fonts in the SDK.

Change-Id: If695baab41a35165f2cdc1120f088b5d6ba61354
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/19888
Tested-by: Hudson CI

diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui.tests/pom.xml b/org.eclipse.linuxtools.lttng2.kernel.ui.tests/pom.xml
index 080c2987813a3cbdd370e4acffd5a90ec720812c..8d847dcf57842b2055a1d0a5efc569abf398d099 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.kernel.ui.tests/pom.xml
+++ b/org.eclipse.linuxtools.lttng2.kernel.ui.tests/pom.xml
@@ -43,6 +43,7 @@
           <testClass>org.eclipse.linuxtools.lttng2.kernel.ui.tests.AllTests</testClass>
           <useUIHarness>true</useUIHarness>
           <useUIThread>true</useUIThread>
           <testClass>org.eclipse.linuxtools.lttng2.kernel.ui.tests.AllTests</testClass>
           <useUIHarness>true</useUIHarness>
           <useUIThread>true</useUIThread>

+          <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>

           <product>org.eclipse.platform.ide</product>
         </configuration>
       </plugin>
           <product>org.eclipse.platform.ide</product>
         </configuration>
       </plugin>

diff --git a/org.eclipse.linuxtools.lttng2.ui.tests/pom.xml b/org.eclipse.linuxtools.lttng2.ui.tests/pom.xml
index 7107d2d27fc0bdb1b3af32c3c84ef0d24a154e8e..802e5a8666c9165528450b44d39e3cc5b9116299 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ui.tests/pom.xml
+++ b/org.eclipse.linuxtools.lttng2.ui.tests/pom.xml
@@ -43,6 +43,7 @@
           <testClass>org.eclipse.linuxtools.lttng2.ui.tests.AllTests</testClass>
           <useUIHarness>true</useUIHarness>
           <useUIThread>true</useUIThread>
           <testClass>org.eclipse.linuxtools.lttng2.ui.tests.AllTests</testClass>
           <useUIHarness>true</useUIHarness>
           <useUIThread>true</useUIThread>

+          <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>

           <product>org.eclipse.platform.ide</product>
         </configuration>
       </plugin>
           <product>org.eclipse.platform.ide</product>
         </configuration>
       </plugin>

diff --git a/org.eclipse.linuxtools.lttng2.ust.core.tests/pom.xml b/org.eclipse.linuxtools.lttng2.ust.core.tests/pom.xml
index 7f4dcd45fddf2d86ec6092df3c5656561edad8b9..86dfa768fd07029aed0ea7179ba94983b0ced485 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ust.core.tests/pom.xml
+++ b/org.eclipse.linuxtools.lttng2.ust.core.tests/pom.xml
@@ -27,7 +27,13 @@
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>

-        <artifactId>tycho-source-plugin</artifactId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <configuration>
+          <useUIHarness>false</useUIHarness>
+          <useUIThread>false</useUIThread>
+          <product>org.eclipse.platform.ide</product>
+        </configuration>

       </plugin>
     </plugins>
   </build>
       </plugin>
     </plugins>
   </build>

diff --git a/org.eclipse.linuxtools.lttng2.ust.ui.tests/pom.xml b/org.eclipse.linuxtools.lttng2.ust.ui.tests/pom.xml
index 3671bc56cf0a5c309b2772958382e0dfc278438b..046bb8be9d16ff24c52a26ccd15ea5401d1d1211 100644 (file)
--- a/org.eclipse.linuxtools.lttng2.ust.ui.tests/pom.xml
+++ b/org.eclipse.linuxtools.lttng2.ust.ui.tests/pom.xml
@@ -34,6 +34,7 @@
           <testClass>org.eclipse.linuxtools.lttng2.ust.ui.tests.AllTests</testClass>
           <useUIHarness>true</useUIHarness>
           <useUIThread>true</useUIThread>
           <testClass>org.eclipse.linuxtools.lttng2.ust.ui.tests.AllTests</testClass>
           <useUIHarness>true</useUIHarness>
           <useUIThread>true</useUIThread>

+          <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>

           <product>org.eclipse.platform.ide</product>
         </configuration>
       </plugin>
           <product>org.eclipse.platform.ide</product>
         </configuration>
       </plugin>

diff --git a/org.eclipse.linuxtools.tmf.analysis.xml.ui.tests/pom.xml b/org.eclipse.linuxtools.tmf.analysis.xml.ui.tests/pom.xml
index 9de096deb4fcbc2d7438bedb96209d0705003d08..ce397b3e0912fcfb6189a75d519ff8698930176b 100644 (file)
--- a/org.eclipse.linuxtools.tmf.analysis.xml.ui.tests/pom.xml
+++ b/org.eclipse.linuxtools.tmf.analysis.xml.ui.tests/pom.xml
@@ -45,6 +45,7 @@
           <testClass>org.eclipse.linuxtools.tmf.analysis.xml.ui.tests.AllAnalysisXmlUiTests</testClass>
           <useUIHarness>true</useUIHarness>
           <useUIThread>true</useUIThread>
           <testClass>org.eclipse.linuxtools.tmf.analysis.xml.ui.tests.AllAnalysisXmlUiTests</testClass>
           <useUIHarness>true</useUIHarness>
           <useUIThread>true</useUIThread>

+          <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>

           <product>org.eclipse.sdk.ide</product>
         </configuration>
       </plugin>
           <product>org.eclipse.sdk.ide</product>
         </configuration>
       </plugin>

diff --git a/org.eclipse.linuxtools.tmf.ui.tests/pom.xml b/org.eclipse.linuxtools.tmf.ui.tests/pom.xml
index 6289575a96aea2a6c7df6f94b7d77c3c2e108ca0..050ca7c62d60c770df6600493c17f009a6a8ff84 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui.tests/pom.xml
+++ b/org.eclipse.linuxtools.tmf.ui.tests/pom.xml
@@ -45,6 +45,7 @@
           <testClass>org.eclipse.linuxtools.tmf.ui.tests.AllTmfUITests</testClass>
           <useUIHarness>true</useUIHarness>
           <useUIThread>true</useUIThread>
           <testClass>org.eclipse.linuxtools.tmf.ui.tests.AllTmfUITests</testClass>
           <useUIHarness>true</useUIHarness>
           <useUIThread>true</useUIThread>

+          <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>

           <product>org.eclipse.platform.ide</product>
         </configuration>
       </plugin>
           <product>org.eclipse.platform.ide</product>
         </configuration>
       </plugin>

diff --git a/pom.xml b/pom.xml
index b5792727b01a7c0e310c7831ad9b3cb1e58d35c7..08a4639b1729df1614204edb668a4a3f4ac83df7 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,11 @@
       </comments>
     </license>
   </licenses>
       </comments>
     </license>
   </licenses>

-  
+
+<properties>
+  <base.test.vmargs>-Xms256m -Xmx1024m -XX:MaxPermSize=256m</base.test.vmargs>
+</properties>
+

 <profiles>
   <profile>
     <id>tracingRcp</id>
 <profiles>
   <profile>
     <id>tracingRcp</id>


@@ -59,8 +63,29 @@
       <modules>
         <module>org.eclipse.linuxtools.lttng.releng-site</module>
       </modules>
       <modules>
         <module>org.eclipse.linuxtools.lttng.releng-site</module>
       </modules>

-  </profile> 
-
+  </profile>
+  <profile>
+    <id>macosx</id>
+    <activation>
+      <os>
+        <family>mac</family>
+      </os>
+    </activation>
+    <properties>
+      <base.ui.test.vmargs>${base.test.vmargs} -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</base.ui.test.vmargs>
+    </properties>
+  </profile>
+  <profile>
+    <id>not-macosx</id>
+    <activation>
+      <os>
+        <family>!mac</family>
+      </os>
+    </activation>
+    <properties>
+      <base.ui.test.vmargs>${base.test.vmargs}</base.ui.test.vmargs>
+    </properties>
+  </profile>

 </profiles>
 
   <modules>
 </profiles>
 
   <modules>