commit fe45614e948ef33906d52a11f11786bce9564c6d
author Stephan Leicht Vogt <stephan.leicht@bsiag.com> Mon Nov 11 17:42:28 2013 +0100
committer Ken Lee <kle@bsiag.com> Mon Nov 11 12:21:15 2013 -0500
tree f000465a168a8bfe497b32c260ba68c9ccc0595d
parent 171b4c52bdd9ee1567c898f1417fc0ecd46d4f63

In some cases jacoco testcoverage is not recorded

- add ui.test.vmarg line as default properties
- new noJacoco profile to set default empty tycho.testArgLine
- update jacoco to newest version

Migration: Activate Jacoco Profile with -Dcodecoverage not with typical
Profile-Activation. This is needed for the backup profile 'noJacoco'.

Change-Id: I72d11907d772b08057d5fbc5e47a8dc4d75c2bba
Reviewed-on: https://git.eclipse.org/r/18273
Reviewed-by: Ken Lee <kle@bsiag.com>
IP-Clean: Ken Lee <kle@bsiag.com>
Tested-by: Ken Lee <kle@bsiag.com>

org.eclipse.scout.parent/pom.xml

diff --git a/org.eclipse.scout.parent/pom.xml b/org.eclipse.scout.parent/pom.xml
index 2c4c7e2..51ab692 100755
--- a/org.eclipse.scout.parent/pom.xml
+++ b/org.eclipse.scout.parent/pom.xml
@@ -89,6 +89,11 @@
     <cbi-jdt-version>3.9.0.v20130604-1421</cbi-jdt-version>
     <cbi-snapshots-repo.url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</cbi-snapshots-repo.url>
     <eclipse-repo.url>https://repo.eclipse.org/content/repositories/releases/</eclipse-repo.url>
+
+<!-- UI-Test (Tycho-Tests) Arguments -->
+    <ui.test.vmargs.all>${tycho.testArgLine} -Xms512m -Xmx1024m -XX:MaxPermSize=256m -DbuildingWithTycho=true</ui.test.vmargs.all>
+    <ui.test.vmargs.mac>-XstartOnFirstThread</ui.test.vmargs.mac>
+    <ui.test.vmargs>${ui.test.vmargs.all}</ui.test.vmargs>
   </properties>
 
   <repositories>
@@ -542,6 +547,18 @@
     </profile>
 
     <profile>
+      <id>mac-test-vmargs</id>
+      <activation>
+        <os>
+          <family>mac</family>
+        </os>
+      </activation>
+      <properties>
+        <ui.test.vmargs>${ui.test.vmargs.all} ${ui.test.vmargs.mac}</ui.test.vmargs>
+      </properties>
+    </profile>
+
+    <profile>
       <id>eclipse-sign</id>
       <build>
         <plugins>
@@ -705,10 +722,27 @@
     </profile>
 
     <profile>
+      <id>noJacoco</id>
+      <activation>
+        <property>
+          <name>!codecoverage</name>
+        </property>
+      </activation>
+      <properties>
+        <tycho.testArgLine></tycho.testArgLine>
+      </properties>
+    </profile>
+
+    <profile>
       <id>jacoco</id>
+      <activation>
+        <property>
+          <name>codecoverage</name>
+        </property>
+      </activation>
       <properties>
         <!-- Jacoco version -->
-        <jacoco.version>0.6.0.201210061924</jacoco.version>
+        <jacoco.version>0.6.3.201306030806</jacoco.version>
         <!-- Sonar properties -->
         <!-- Tells Sonar to reuse existing reports -->
         <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>