mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 06:02:11 +02:00
Code Issues Wiki Activity

Add missing arg for jacoco in in tests. Update jacoco.

Browse source 
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>
This commit is contained in:
Marc-Andre Laperle 2014-08-28 14:11:05 -04:00
parent 9a25ff506e
commit 97079f6ad0
21 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.autotools.tests/pom.xml
View file

@ -32,7 +32,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>true</useUIHarness> <useUIHarness>true</useUIHarness>
<argLine>${base.ui.test.vmargs}</argLine> <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
<includes> <includes>
<include>**/AllAutotoolsTests.*</include> <include>**/AllAutotoolsTests.*</include>
</includes> </includes>

2
build/org.eclipse.cdt.autotools.ui.tests/pom.xml
View file

@ -33,7 +33,7 @@
<useUIThread>false</useUIThread> <useUIThread>false</useUIThread>
<product>org.eclipse.platform.ide</product> <product>org.eclipse.platform.ide</product>
<application>org.eclipse.ui.ide.workbench</application> <application>org.eclipse.ui.ide.workbench</application>
<argLine>${base.ui.test.vmargs}</argLine> <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
<includes> <includes>
<include>**/AllTests.*</include> <include>**/AllTests.*</include>
</includes> </includes>

2
build/org.eclipse.cdt.make.core.tests/pom.xml
View file

@ -23,7 +23,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>false</useUIHarness> <useUIHarness>false</useUIHarness>
<argLine>-Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine> <argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes> <includes>
<include>**/AutomatedIntegrationSuite.*</include> <include>**/AutomatedIntegrationSuite.*</include>
</includes> </includes>

2
build/org.eclipse.cdt.make.ui.tests/pom.xml
View file

@ -23,7 +23,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>true</useUIHarness> <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> <includes>
<include>**/AllMakeUITests.*</include> <include>**/AllMakeUITests.*</include>
</includes> </includes>

2
build/org.eclipse.cdt.managedbuilder.core.tests/pom.xml
View file

@ -33,7 +33,7 @@
<configuration> <configuration>
<!-- Yes, the managed build core tests use the UI harness. --> <!-- Yes, the managed build core tests use the UI harness. -->
<useUIHarness>true</useUIHarness> <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> <includes>
<include>**/AllManagedBuildTests.*</include> <include>**/AllManagedBuildTests.*</include>
</includes> </includes>

2
build/org.eclipse.cdt.managedbuilder.ui.tests/pom.xml
View file

@ -23,7 +23,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>true</useUIHarness> <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> <includes>
<include>**/AllManagedBuildUITests.*</include> <include>**/AllManagedBuildUITests.*</include>
</includes> </includes>

2
codan/org.eclipse.cdt.codan.core.test/pom.xml
View file

@ -24,7 +24,7 @@
<configuration> <configuration>
<!-- Need UI harness for quick fix tests --> <!-- Need UI harness for quick fix tests -->
<useUIHarness>true</useUIHarness> <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> <includes>
<include>**/AutomatedIntegrationSuite.*</include> <include>**/AutomatedIntegrationSuite.*</include>
</includes> </includes>

2
core/org.eclipse.cdt.alltests/pom.xml
View file

@ -23,7 +23,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>false</useUIHarness> <useUIHarness>false</useUIHarness>
<argLine>-Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine> <argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes> <includes>
<include>**/UPCParserTestSuite.*</include> <include>**/UPCParserTestSuite.*</include>
</includes> </includes>

2
core/org.eclipse.cdt.core.tests/pom.xml
View file

@ -33,7 +33,7 @@
<configuration> <configuration>
<useUIHarness>false</useUIHarness> <useUIHarness>false</useUIHarness>
<!-- Core tests actually use eclipse.ui classes, see CProjectHelper --> <!-- 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> <includes>
<include>**/AutomatedIntegrationSuite.*</include> <include>**/AutomatedIntegrationSuite.*</include>
</includes> </includes>

2
core/org.eclipse.cdt.ui.tests/pom.xml
View file

@ -31,7 +31,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>true</useUIHarness> <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> <includes>
<include>**/AutomatedSuite.*</include> <include>**/AutomatedSuite.*</include>
</includes> </includes>

2
debug/org.eclipse.cdt.debug.ui.tests/pom.xml
View file

@ -23,7 +23,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>true</useUIHarness> <useUIHarness>true</useUIHarness>
<argLine>-Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine> <argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes> <includes>
<include>**/AllDebugTests.*</include> <include>**/AllDebugTests.*</include>
</includes> </includes>

2
dsf-gdb/org.eclipse.cdt.dsf.gdb.tests/pom.xml
View file

@ -34,7 +34,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>false</useUIHarness> <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> <includes>
<include>**/AllTests.*</include> <include>**/AllTests.*</include>
</includes> </includes>

2
dsf-gdb/org.eclipse.cdt.tests.dsf.gdb/pom.xml
View file

@ -57,7 +57,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>false</useUIHarness> <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> <includes>
<include>**/${gdbTestSuite}</include> <include>**/${gdbTestSuite}</include>
</includes> </includes>

2
launch/org.eclipse.cdt.launchbar.core.tests/pom.xml
View file

@ -24,7 +24,7 @@
<configuration> <configuration>
<!-- It does not need ui, but it does not work headless for some reason --> <!-- It does not need ui, but it does not work headless for some reason -->
<useUIHarness>true</useUIHarness> <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> <includes>
<include>**/AutomatedIntegrationSuite.*</include> <include>**/AutomatedIntegrationSuite.*</include>
</includes> </includes>

2
lrparser/org.eclipse.cdt.core.lrparser.tests/pom.xml
View file

@ -23,7 +23,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>false</useUIHarness> <useUIHarness>false</useUIHarness>
<argLine>-Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine> <argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes> <includes>
<include>**/LRParserTestSuite.*</include> <include>**/LRParserTestSuite.*</include>
</includes> </includes>

2
pom.xml
View file

@ -435,7 +435,7 @@
<plugin> <plugin>
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
<version>0.6.2.201302030002</version> <version>0.7.1.201405082137</version>
<executions> <executions>
<execution> <execution>
<id>pre-test</id> <id>pre-test</id>

2
qt/org.eclipse.cdt.qt.tests/pom.xml
View file

@ -32,7 +32,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>true</useUIHarness> <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> <includes>
<include>**/AllQtTests.*</include> <include>**/AllQtTests.*</include>
</includes> </includes>

2
testsrunner/org.eclipse.cdt.testsrunner.test/pom.xml
View file

@ -32,7 +32,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>true</useUIHarness> <useUIHarness>true</useUIHarness>
<argLine>${base.ui.test.vmargs}</argLine> <argLine>${tycho.testArgLine} ${base.ui.test.vmargs}</argLine>
<includes> <includes>
<include>**/TestsRunnerSuite.*</include> <include>**/TestsRunnerSuite.*</include>
</includes> </includes>

2
upc/org.eclipse.cdt.core.parser.upc.tests/pom.xml
View file

@ -23,7 +23,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>false</useUIHarness> <useUIHarness>false</useUIHarness>
<argLine>-Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine> <argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes> <includes>
<include>**/UPCParserTestSuite.*</include> <include>**/UPCParserTestSuite.*</include>
</includes> </includes>

2
xlc/org.eclipse.cdt.core.lrparser.xlc.tests/pom.xml
View file

@ -23,7 +23,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>false</useUIHarness> <useUIHarness>false</useUIHarness>
<argLine>-Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine> <argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes> <includes>
<include>**/XlcTestSuite.*</include> <include>**/XlcTestSuite.*</include>
</includes> </includes>

2
xlc/org.eclipse.cdt.errorparsers.xlc.tests/pom.xml
View file

@ -23,7 +23,7 @@
<version>${tycho-version}</version> <version>${tycho-version}</version>
<configuration> <configuration>
<useUIHarness>false</useUIHarness> <useUIHarness>false</useUIHarness>
<argLine>-Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine> <argLine>${tycho.testArgLine} -Xms256m -Xmx512m -XX:MaxPermSize=256M</argLine>
<includes> <includes>
<include>**/AllXlcErrorParserTests.*</include> <include>**/AllXlcErrorParserTests.*</include>
</includes> </includes>