Skip to content

Include distribution test as part of jacoco report and fix aggregated jacoco report #12797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 25 commits into
base: jetty-12.0.x
Choose a base branch
from
Open

Include distribution test as part of jacoco report and fix aggregated jacoco report #12797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a0a6695
fix aggregated jacoco report
olamy Feb 16, 2025
2097ee7
exlude jakarta/xml from jacoco
olamy Feb 17, 2025
c812b02
only use aggregated file
olamy Feb 17, 2025
66f13e0
fix sourceDirectories
olamy Feb 17, 2025
1f9594d
add sources
olamy Feb 17, 2025
060bb67
simplify sources coverage
olamy Feb 17, 2025
b448bc0
do not store source code
olamy Feb 17, 2025
09950d7
exclude useless packages from jacoco
olamy Feb 18, 2025
f4ffece
exclude useless packages from jacoco
olamy Feb 18, 2025
b60424c
exclude useless packages from jacoco
olamy Feb 18, 2025
536d5cf
try using only includes
olamy Feb 18, 2025
cc0f5a9
spotless
olamy Feb 18, 2025
858c742
trying both includes and excludes
olamy Feb 18, 2025
092e784
excludes with includes does not work really well
olamy Feb 18, 2025
fcb84fb
correctly exclude some jmh classes not following pattern with jmh pac…
olamy Feb 19, 2025
f166bbd
setup distribution test to add data to jacoco files as it is code cov…
olamy Feb 19, 2025
8cc922f
arg cannot be empty
olamy Feb 19, 2025
5e0c0f4
1.0.2 aggregator plugin
olamy Apr 14, 2025
f468faa
spotlesS
olamy Mar 14, 2025
f3db1b3
force full name
olamy Mar 14, 2025
196d818
in plugins section so shorter cli
olamy Mar 14, 2025
ed192db
separate aggregation from main build
olamy Mar 14, 2025
30d5c15
upgrade jacoco plugins
olamy Apr 7, 2025
dce3686
upgrade
olamy Apr 8, 2025
e7219d2
full name needed
olamy Jun 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ pipeline {
steps {
timeout( time: 180, unit: 'MINUTES' ) {
checkout scm
mavenBuild( "jdk17", "clean install -Dspotbugs.skip=true", "maven3") // javadoc:javadoc
mavenBuild( "jdk17", "clean install io.github.olamy.maven.plugins:jacoco-aggregator-maven-plugin:report-aggregate-all", "maven3") // javadoc:javadoc
recordIssues id: "analysis-jdk17", name: "Static Analysis jdk17", aggregatingResults: true, enabledForFailure: true,
tools: [mavenConsole(), java(), javaDoc()],
skipPublishingChecks: true, skipBlames: true
recordCoverage id: "coverage-jdk17", name: "Coverage jdk17",
tools: [[parser: 'JACOCO'], [parser: 'JUNIT', pattern: '**/target/surefire-reports/**/TEST*.xml,**/target/invoker-reports/TEST*.xml']],
sourceCodeRetention: 'MODIFIED',
sourceDirectories: [[path: 'src/main/java'], [path: 'target/generated-sources/ee8']]
tools: [[parser: 'JACOCO',pattern: 'target/site/jacoco-aggregate/jacoco.xml'],
[parser: 'JUNIT', pattern: '**/target/surefire-reports/**/TEST*.xml,**/target/invoker-reports/TEST*.xml']],
sourceCodeRetention: 'NEVER' //MODIFIED
}
}
}
Expand Down
62 changes: 56 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1337,6 +1337,11 @@
<artifactId>njord</artifactId>
<version>${njord.version}</version>
</plugin>
<plugin>
<groupId>io.github.olamy.maven.plugins</groupId>
<artifactId>jacoco-aggregator-maven-plugin</artifactId>
<version>1.0.2</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down Expand Up @@ -1580,6 +1585,7 @@
<jetty.unixdomain.dir>${jetty.unixdomain.dir}</jetty.unixdomain.dir>
<jetty.testtracker.log>${jetty.testtracker.log}</jetty.testtracker.log>
<pax.exam.debug.remote>${pax.exam.debug.remote}</pax.exam.debug.remote>
<distributionTest.args>${distributionTest.args}</distributionTest.args>
</systemPropertyVariables>
<!-- The LC_ALL env variable must have some UTF variant otherwise creating and/or reading files with non-ascii names doesn't work -->
<environmentVariables>
Expand Down Expand Up @@ -1791,6 +1797,35 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>io.github.olamy.maven.plugins</groupId>
<artifactId>jacoco-aggregator-maven-plugin</artifactId>
<version>1.0.2</version>
<configuration>
<excludes>
<exclude>**/org/eclipse/jetty/ant/**</exclude>
<exclude>**/com/oracle/**</exclude>
<exclude>**/javax/**</exclude>
<exclude>*/org/eclipse/jetty/maven/its/**</exclude>
<!-- example code / documentation -->
<exclude>**/org/eclipse/jetty/embedded/**</exclude>
<exclude>**/org/eclipse/jetty/asyncrest/**</exclude>
<exclude>**/org/eclipse/jetty/demo/**</exclude>
<exclude>**/org/eclipse/jdt/**</exclude>
<exclude>**/jmh**/**</exclude>
<exclude>**/org/eclipse/jetty/docs/programming/**</exclude>
<exclude>**/org/eclipse/jetty/osgi/**</exclude>
<!-- test classes -->
<exclude>**/org/eclipse/jetty/tests/**</exclude>
<exclude>**/org/eclipse/jetty/test/**</exclude>
<exclude>**/jakarta/xml/**</exclude>
<exclude>**/org/apache/**</exclude>
<exclude>**/org/slf4j/**</exclude>
<exclude>**/org/objectweb/**</exclude>
<exclude>**/**Benchmark**</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
Expand Down Expand Up @@ -1989,22 +2024,26 @@
<artifactId>jacoco-maven-plugin</artifactId>
<configuration>
<excludes>
<!-- build tools -->
<exclude>**/org/eclipse/jetty/ant/**</exclude>
<exclude>**/com/oracle/**</exclude>
<exclude>**/javax/**</exclude>
<exclude>*/org/eclipse/jetty/maven/its/**</exclude>
<!-- example code / documentation -->
<exclude>**/org/eclipse/jetty/embedded/**</exclude>
<exclude>**/org/eclipse/jetty/asyncrest/**</exclude>
<exclude>**/org/eclipse/jetty/demo/**</exclude>
<!-- special environments / late integrations -->
<exclude>**/org/eclipse/jetty/gcloud/**</exclude>
<exclude>**/org/eclipse/jetty/infinispan/**</exclude>
<exclude>**/org/eclipse/jdt/**</exclude>
<exclude>**/jmh**/**</exclude>
<exclude>**/org/eclipse/jetty/docs/programming/**</exclude>
<exclude>**/org/eclipse/jetty/osgi/**</exclude>
<exclude>**/org/eclipse/jetty/spring/**</exclude>
<exclude>**/org/eclipse/jetty/http/spi/**</exclude>
<!-- test classes -->
<exclude>**/org/eclipse/jetty/tests/**</exclude>
<exclude>**/org/eclipse/jetty/test/**</exclude>
<exclude>**/jakarta/xml/**</exclude>
<exclude>**/org/apache/**</exclude>
<exclude>**/org/slf4j/**</exclude>
<exclude>**/org/objectweb/**</exclude>
<exclude>**/**Benchmark**</exclude>
</excludes>
</configuration>
<executions>
Expand All @@ -2015,6 +2054,17 @@
</goals>
<phase>initialize</phase>
</execution>
<execution>
<id>jacoco-setup-distribution-tests</id>
<goals>
<goal>prepare-agent</goal>
</goals>
<phase>initialize</phase>
<configuration>
<!-- Enable recording of coverage during execution of distribution tests -->
<propertyName>distributionTest.args</propertyName>
</configuration>
</execution>
<execution>
<id>jacoco-setup-m-invoker-p</id>
<goals>
Expand Down
7 changes: 7 additions & 0 deletions tests/jetty-testers/src/main/java/org/eclipse/jetty/tests/testers/JettyHomeTester.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,13 @@ public JettyHomeTester.Run start(List<String> jvmArgs, List<String> args) throws
int debugPort = Integer.getInteger("distribution.debug.port", 0);
if (debugPort > 0)
commands.add("-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:" + debugPort);

String disTestArgs = System.getProperty("distributionTest.args");
if (StringUtils.isNotBlank(disTestArgs))
{
commands.add(disTestArgs);
}

commands.add("-jar");
commands.add(config.jettyHome.toAbsolutePath() + "/start.jar");

Expand Down