Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc-Andre Laperle2014-08-28 18:11:05 +0000
committerMarc-Andre Laperle2014-08-28 19:40:26 +0000
commit97079f6ad098c3f7e0f413e2280f56e20848717c (patch)
tree325afdfc85152aa890a61cf693b71de7c2723c23
parent9a25ff506e2e1e35439453aee236fc35f5527edb (diff)
downloadorg.eclipse.cdt-97079f6ad098c3f7e0f413e2280f56e20848717c.tar.gz
org.eclipse.cdt-97079f6ad098c3f7e0f413e2280f56e20848717c.tar.xz
org.eclipse.cdt-97079f6ad098c3f7e0f413e2280f56e20848717c.zip
Add missing arg for jacoco in in tests. Update jacoco.
Jacoco arguments are missing when executing certain tests. This happens when argLine is being overriden. We had the same problem in Linux Tools. We solved it by prepending the argLine with ${tycho.testArgLine}. This should help improving the Code coverage metric in Sonar. Also update the jacoco version to fix a bug when building with Java 8. Change-Id: I7f73f40488efc01fc7d643940c1ac0d5950c900d Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com> Reviewed-on: https://git.eclipse.org/r/32507 Tested-by: Hudson CI Reviewed-by: Alvaro Sanchez-Leon <alvsan09@gmail.com>
-rw-r--r--build/org.eclipse.cdt.autotools.tests/pom.xml2
-rw-r--r--build/org.eclipse.cdt.autotools.ui.tests/pom.xml2
-rw-r--r--build/org.eclipse.cdt.make.core.tests/pom.xml2
-rw-r--r--build/org.eclipse.cdt.make.ui.tests/pom.xml2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml2
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui.tests/pom.xml2
-rw-r--r--codan/org.eclipse.cdt.codan.core.test/pom.xml2
-rw-r--r--core/org.eclipse.cdt.alltests/pom.xml2
-rw-r--r--core/org.eclipse.cdt.core.tests/pom.xml2
-rw-r--r--core/org.eclipse.cdt.ui.tests/pom.xml2
-rw-r--r--debug/org.eclipse.cdt.debug.ui.tests/pom.xml2
-rw-r--r--dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml2
-rw-r--r--dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml2
-rw-r--r--launch/org.eclipse.cdt.launchbar.core.tests/pom.xml2
-rw-r--r--lrparser/org.eclipse.cdt.core.lrparser.tests/pom.xml2
-rw-r--r--pom.xml2
-rw-r--r--qt/org.eclipse.cdt.qt.tests/pom.xml2
-rw-r--r--testsrunner/org.eclipse.cdt.testsrunner.test/pom.xml2
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.tests/pom.xml2
-rw-r--r--xlc/org.eclipse.cdt.core.lrparser.xlc.tests/pom.xml2
-rw-r--r--xlc/org.eclipse.cdt.errorparsers.xlc.tests/pom.xml2
21 files changed, 21 insertions, 21 deletions
diff --git a/build/org.eclipse.cdt.autotools.tests/pom.xml b/build/org.eclipse.cdt.autotools.tests/pom.xml
index 0fdd095d772..d841a918b1f 100644
--- a/build/org.eclipse.cdt.autotools.tests/pom.xml
+++ b/build/org.eclipse.cdt.autotools.tests/pom.xml
@@ -32,7 +32,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
- <argLine>${base.ui.test.vmargs}</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
<includes>
<include>**/AllAutotoolsTests.*</include>
</includes>
diff --git a/build/org.eclipse.cdt.autotools.ui.tests/pom.xml b/build/org.eclipse.cdt.autotools.ui.tests/pom.xml
index 3d76daec1eb..49816d638f7 100644
--- a/build/org.eclipse.cdt.autotools.ui.tests/pom.xml
+++ b/build/org.eclipse.cdt.autotools.ui.tests/pom.xml
@@ -33,7 +33,7 @@
<useUIThread>false</useUIThread>
<product>org.eclipse.platform.ide</product>
<application>org.eclipse.ui.ide.workbench</application>
- <argLine>${base.ui.test.vmargs}</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
<includes>
<include>**/AllTests.*</include>
</includes>
diff --git a/build/org.eclipse.cdt.make.core.tests/pom.xml b/build/org.eclipse.cdt.make.core.tests/pom.xml
index 73a1646db1b..1e518fff8ca 100644
--- a/build/org.eclipse.cdt.make.core.tests/pom.xml
+++ b/build/org.eclipse.cdt.make.core.tests/pom.xml
@@ -23,7 +23,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>false</useUIHarness>
- <argLine>-Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes>
<include>**/AutomatedIntegrationSuite.*</include>
</includes>
diff --git a/build/org.eclipse.cdt.make.ui.tests/pom.xml b/build/org.eclipse.cdt.make.ui.tests/pom.xml
index fa61bed9468..480ee052332 100644
--- a/build/org.eclipse.cdt.make.ui.tests/pom.xml
+++ b/build/org.eclipse.cdt.make.ui.tests/pom.xml
@@ -23,7 +23,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
- <argLine>${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes>
<include>**/AllMakeUITests.*</include>
</includes>
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml b/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml
index 8e0174e6a70..1904deae462 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml
@@ -33,7 +33,7 @@
<configuration>
<!-- Yes, the managed build core tests use the UI harness. -->
<useUIHarness>true</useUIHarness>
- <argLine>${base.ui.test.vmargs} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes>
<include>**/AllManagedBuildTests.*</include>
</includes>
diff --git a/build/org.eclipse.cdt.managedbuilder.ui.tests/pom.xml b/build/org.eclipse.cdt.managedbuilder.ui.tests/pom.xml
index 664656b5c4d..05cb4ed0a6d 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui.tests/pom.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui.tests/pom.xml
@@ -23,7 +23,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
- <argLine>${base.ui.test.vmargs} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes>
<include>**/AllManagedBuildUITests.*</include>
</includes>
diff --git a/codan/org.eclipse.cdt.codan.core.test/pom.xml b/codan/org.eclipse.cdt.codan.core.test/pom.xml
index cc1e065d90f..f2dc937f539 100644
--- a/codan/org.eclipse.cdt.codan.core.test/pom.xml
+++ b/codan/org.eclipse.cdt.codan.core.test/pom.xml
@@ -24,7 +24,7 @@
<configuration>
<!-- Need UI harness for quick fix tests -->
<useUIHarness>true</useUIHarness>
- <argLine>${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes>
<include>**/AutomatedIntegrationSuite.*</include>
</includes>
diff --git a/core/org.eclipse.cdt.alltests/pom.xml b/core/org.eclipse.cdt.alltests/pom.xml
index 46d10ebd50b..b164561df2d 100644
--- a/core/org.eclipse.cdt.alltests/pom.xml
+++ b/core/org.eclipse.cdt.alltests/pom.xml
@@ -23,7 +23,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>false</useUIHarness>
- <argLine>-Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes>
<include>**/UPCParserTestSuite.*</include>
</includes>
diff --git a/core/org.eclipse.cdt.core.tests/pom.xml b/core/org.eclipse.cdt.core.tests/pom.xml
index 39beaf2e446..deff550357f 100644
--- a/core/org.eclipse.cdt.core.tests/pom.xml
+++ b/core/org.eclipse.cdt.core.tests/pom.xml
@@ -33,7 +33,7 @@
<configuration>
<useUIHarness>false</useUIHarness>
<!-- Core tests actually use eclipse.ui classes, see CProjectHelper -->
- <argLine>${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes>
<include>**/AutomatedIntegrationSuite.*</include>
</includes>
diff --git a/core/org.eclipse.cdt.ui.tests/pom.xml b/core/org.eclipse.cdt.ui.tests/pom.xml
index 48825e43907..f1481ee02ed 100644
--- a/core/org.eclipse.cdt.ui.tests/pom.xml
+++ b/core/org.eclipse.cdt.ui.tests/pom.xml
@@ -31,7 +31,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
- <argLine>${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes>
<include>**/AutomatedSuite.*</include>
</includes>
diff --git a/debug/org.eclipse.cdt.debug.ui.tests/pom.xml b/debug/org.eclipse.cdt.debug.ui.tests/pom.xml
index 17761b59afe..164ad44b5bc 100644
--- a/debug/org.eclipse.cdt.debug.ui.tests/pom.xml
+++ b/debug/org.eclipse.cdt.debug.ui.tests/pom.xml
@@ -23,7 +23,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
- <argLine>-Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes>
<include>**/AllDebugTests.*</include>
</includes>
diff --git a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml
index 63ee806ec5c..a8fab4cb287 100644
--- a/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml
+++ b/dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml
@@ -34,7 +34,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>false</useUIHarness>
- <argLine>${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes>
<include>**/AllTests.*</include>
</includes>
diff --git a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
index 730e3c90812..0c77061eb1c 100644
--- a/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
+++ b/dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
@@ -57,7 +57,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>false</useUIHarness>
- <argLine>${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M ${gdbPathOption}</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M ${gdbPathOption}</argLine>
<includes>
<include>**/${gdbTestSuite}</include>
</includes>
diff --git a/launch/org.eclipse.cdt.launchbar.core.tests/pom.xml b/launch/org.eclipse.cdt.launchbar.core.tests/pom.xml
index b79371ce6c5..0570281df5e 100644
--- a/launch/org.eclipse.cdt.launchbar.core.tests/pom.xml
+++ b/launch/org.eclipse.cdt.launchbar.core.tests/pom.xml
@@ -24,7 +24,7 @@
<configuration>
<!-- It does not need ui, but it does not work headless for some reason -->
<useUIHarness>true</useUIHarness>
- <argLine>${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes>
<include>**/AutomatedIntegrationSuite.*</include>
</includes>
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.tests/pom.xml b/lrparser/org.eclipse.cdt.core.lrparser.tests/pom.xml
index fc563082bd1..5baf3635375 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.tests/pom.xml
+++ b/lrparser/org.eclipse.cdt.core.lrparser.tests/pom.xml
@@ -23,7 +23,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>false</useUIHarness>
- <argLine>-Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes>
<include>**/LRParserTestSuite.*</include>
</includes>
diff --git a/pom.xml b/pom.xml
index f75b4a349c3..50fe72d6204 100644
--- a/pom.xml
+++ b/pom.xml
@@ -435,7 +435,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.6.2.201302030002</version>
+ <version>0.7.1.201405082137</version>
<executions>
<execution>
<id>pre-test</id>
diff --git a/qt/org.eclipse.cdt.qt.tests/pom.xml b/qt/org.eclipse.cdt.qt.tests/pom.xml
index ce026fb032a..5daf1ec5b36 100644
--- a/qt/org.eclipse.cdt.qt.tests/pom.xml
+++ b/qt/org.eclipse.cdt.qt.tests/pom.xml
@@ -32,7 +32,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
- <argLine>${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes>
<include>**/AllQtTests.*</include>
</includes>
diff --git a/testsrunner/org.eclipse.cdt.testsrunner.test/pom.xml b/testsrunner/org.eclipse.cdt.testsrunner.test/pom.xml
index 0892f8cab25..07cf0cc5144 100644
--- a/testsrunner/org.eclipse.cdt.testsrunner.test/pom.xml
+++ b/testsrunner/org.eclipse.cdt.testsrunner.test/pom.xml
@@ -32,7 +32,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>true</useUIHarness>
- <argLine>${base.ui.test.vmargs}</argLine>
+ <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
<includes>
<include>**/TestsRunnerSuite.*</include>
</includes>
diff --git a/upc/org.eclipse.cdt.core.parser.upc.tests/pom.xml b/upc/org.eclipse.cdt.core.parser.upc.tests/pom.xml
index 46d10ebd50b..b164561df2d 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.tests/pom.xml
+++ b/upc/org.eclipse.cdt.core.parser.upc.tests/pom.xml
@@ -23,7 +23,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>false</useUIHarness>
- <argLine>-Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes>
<include>**/UPCParserTestSuite.*</include>
</includes>
diff --git a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/pom.xml b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/pom.xml
index 2a0dc10904a..f9656b5b418 100644
--- a/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/pom.xml
+++ b/xlc/org.eclipse.cdt.core.lrparser.xlc.tests/pom.xml
@@ -23,7 +23,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>false</useUIHarness>
- <argLine>-Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes>
<include>**/XlcTestSuite.*</include>
</includes>
diff --git a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/pom.xml b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/pom.xml
index fe747cc0491..94c709902c3 100644
--- a/xlc/org.eclipse.cdt.errorparsers.xlc.tests/pom.xml
+++ b/xlc/org.eclipse.cdt.errorparsers.xlc.tests/pom.xml
@@ -23,7 +23,7 @@
<version>${tycho-version}</version>
<configuration>
<useUIHarness>false</useUIHarness>
- <argLine>-Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
+ <argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes>
<include>**/AllXlcErrorParserTests.*</include>
</includes>

Back to the top