From 97079f6ad098c3f7e0f413e2280f56e20848717c Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Thu, 28 Aug 2014 14:11:05 -0400 Subject: [PATCH] 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 Reviewed-on: https://git.eclipse.org/r/32507 Tested-by: Hudson CI Reviewed-by: Alvaro Sanchez-Leon --- build/org.eclipse.cdt.autotools.tests/pom.xml | 2 +- build/org.eclipse.cdt.autotools.ui.tests/pom.xml | 2 +- build/org.eclipse.cdt.make.core.tests/pom.xml | 2 +- build/org.eclipse.cdt.make.ui.tests/pom.xml | 2 +- build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml | 2 +- build/org.eclipse.cdt.managedbuilder.ui.tests/pom.xml | 2 +- codan/org.eclipse.cdt.codan.core.test/pom.xml | 2 +- core/org.eclipse.cdt.alltests/pom.xml | 2 +- core/org.eclipse.cdt.core.tests/pom.xml | 2 +- core/org.eclipse.cdt.ui.tests/pom.xml | 2 +- debug/org.eclipse.cdt.debug.ui.tests/pom.xml | 2 +- dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml | 2 +- dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml | 2 +- launch/org.eclipse.cdt.launchbar.core.tests/pom.xml | 2 +- lrparser/org.eclipse.cdt.core.lrparser.tests/pom.xml | 2 +- pom.xml | 2 +- qt/org.eclipse.cdt.qt.tests/pom.xml | 2 +- testsrunner/org.eclipse.cdt.testsrunner.test/pom.xml | 2 +- upc/org.eclipse.cdt.core.parser.upc.tests/pom.xml | 2 +- xlc/org.eclipse.cdt.core.lrparser.xlc.tests/pom.xml | 2 +- xlc/org.eclipse.cdt.errorparsers.xlc.tests/pom.xml | 2 +- 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 @@ ${tycho-version} true - ${base.ui.test.vmargs} + ${tycho.testArgLine} ${base.ui.test.vmargs} **/AllAutotoolsTests.* 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 @@ false org.eclipse.platform.ide org.eclipse.ui.ide.workbench - ${base.ui.test.vmargs} + ${tycho.testArgLine} ${base.ui.test.vmargs} **/AllTests.* 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 @@ ${tycho-version} false - -Xms256m -Xmx512m -XX:MaxPermSize=256M + ${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M **/AutomatedIntegrationSuite.* 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 @@ ${tycho-version} true - ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M + ${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M **/AllMakeUITests.* 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 @@ true - ${base.ui.test.vmargs} -Xms256m -Xmx512m -XX:MaxPermSize=256M + ${tycho.testArgLine} ${base.ui.test.vmargs} -Xms256m -Xmx512m -XX:MaxPermSize=256M **/AllManagedBuildTests.* 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 @@ ${tycho-version} true - ${base.ui.test.vmargs} -Xms256m -Xmx512m -XX:MaxPermSize=256M + ${tycho.testArgLine} ${base.ui.test.vmargs} -Xms256m -Xmx512m -XX:MaxPermSize=256M **/AllManagedBuildUITests.* 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 @@ true - ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M + ${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M **/AutomatedIntegrationSuite.* 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 @@ ${tycho-version} false - -Xms256m -Xmx512m -XX:MaxPermSize=256M + ${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M **/UPCParserTestSuite.* 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 @@ false - ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M + ${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M **/AutomatedIntegrationSuite.* 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 @@ ${tycho-version} true - ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M + ${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M **/AutomatedSuite.* 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 @@ ${tycho-version} true - -Xms256m -Xmx512m -XX:MaxPermSize=256M + ${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M **/AllDebugTests.* 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 @@ ${tycho-version} false - ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M + ${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M **/AllTests.* 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 @@ ${tycho-version} false - ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M ${gdbPathOption} + ${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M ${gdbPathOption} **/${gdbTestSuite} 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 @@ true - ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M + ${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M **/AutomatedIntegrationSuite.* 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 @@ ${tycho-version} false - -Xms256m -Xmx512m -XX:MaxPermSize=256M + ${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M **/LRParserTestSuite.* diff --git a/pom.xml b/pom.xml index f75b4a349c3..50fe72d6204 100644 --- a/pom.xml +++ b/pom.xml @@ -435,7 +435,7 @@ org.jacoco jacoco-maven-plugin - 0.6.2.201302030002 + 0.7.1.201405082137 pre-test 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 @@ ${tycho-version} true - ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M + ${tycho.testArgLine} ${base.ui.test.vmargs} -ea -Xms256m -Xmx512m -XX:MaxPermSize=256M **/AllQtTests.* 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 @@ ${tycho-version} true - ${base.ui.test.vmargs} + ${tycho.testArgLine} ${base.ui.test.vmargs} **/TestsRunnerSuite.* 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 @@ ${tycho-version} false - -Xms256m -Xmx512m -XX:MaxPermSize=256M + ${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M **/UPCParserTestSuite.* 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 @@ ${tycho-version} false - -Xms256m -Xmx512m -XX:MaxPermSize=256M + ${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M **/XlcTestSuite.* 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 @@ ${tycho-version} false - -Xms256m -Xmx512m -XX:MaxPermSize=256M + ${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M **/AllXlcErrorParserTests.*