From 617a130cbc51aa8bd3c8615a2e9c1de4c03aa73d Mon Sep 17 00:00:00 2001
From: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Date: Thu, 4 Feb 2016 17:29:43 -0500
Subject: [PATCH] Fix jacoco agent not added to command line (code coverage)

It seems that tycho.testArgLine doesn't get set again by
tycho-surefire if it was set in the root properties.
I orginally defined it to nothing so that it would be defined
when running without jacoco. Instead, we can introduce a new
variable and never touch tycho.testArgLine.

Change-Id: I5f2969ad65292ad2e6fa84d3fb46bf925064981c
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/65953
Reviewed-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
---
 pom.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 165a6ec51c..02eae8b1ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <tycho.testArgLine></tycho.testArgLine>
+    <testArgLine></testArgLine>
 
     <tycho-version>0.24.0</tycho-version>
     <tycho-extras-version>0.24.0</tycho-extras-version>
@@ -154,6 +154,9 @@
           <name>!skip-jacoco</name>
         </property>
       </activation>
+      <properties>
+        <testArgLine>${tycho.testArgLine}</testArgLine>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -482,7 +485,7 @@
                </dependency>
             </dependencies>
             <product>org.eclipse.platform.ide</product>
-            <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -Xms512m -Xmx1024m</argLine>
+            <argLine>${testArgLine} ${base.ui.test.vmargs} -Xms512m -Xmx1024m</argLine>
           </configuration>
         </plugin>
 
-- 
2.34.1