This is an automated email from the ASF dual-hosted git repository. elek pushed a commit to branch HDDS-2587 in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit 9d3a84518a3e74dcd9598a7672e13ee20062313b Author: Márton Elek <e...@apache.org> AuthorDate: Thu Nov 21 15:43:15 2019 +0100 coverage report is turned on --- hadoop-hdds/pom.xml | 3 ++- hadoop-ozone/dev-support/checks/unit.sh | 2 +- hadoop-ozone/pom.xml | 3 ++- pom.xml | 20 +++++++++++++++++++- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/hadoop-hdds/pom.xml b/hadoop-hdds/pom.xml index 9cd5db3..882755a 100644 --- a/hadoop-hdds/pom.xml +++ b/hadoop-hdds/pom.xml @@ -369,7 +369,8 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd"> <configuration> <forkCount>${testsThreadCount}</forkCount> <reuseForks>false</reuseForks> - <argLine>${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true</argLine> + <!-- @argLine is filled by jacoco maven plugin. @{} means late evaluation --> + <argLine>${maven-surefire-plugin.argLine} @{argLine} -DminiClusterDedicatedDirs=true</argLine> <systemPropertyVariables> <testsThreadCount>${testsThreadCount}</testsThreadCount> <test.build.data>${test.build.data}/${surefire.forkNumber}</test.build.data> diff --git a/hadoop-ozone/dev-support/checks/unit.sh b/hadoop-ozone/dev-support/checks/unit.sh index 44b6d0b..585375e 100755 --- a/hadoop-ozone/dev-support/checks/unit.sh +++ b/hadoop-ozone/dev-support/checks/unit.sh @@ -17,7 +17,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" cd "$DIR/../../.." || exit 1 export MAVEN_OPTS="-Xmx4096m" -mvn -B -fn test -pl \!:hadoop-ozone-integration-test,\!:hadoop-ozone-filesystem,\!:hadoop-ozone-tools "$@" +mvn -B -DskipShade -Dskip.yarn -fn test -pl \!:hadoop-ozone-integration-test,\!:hadoop-ozone-filesystem,\!:hadoop-ozone-tools "$@" REPORT_DIR=${OUTPUT_DIR:-"$DIR/../../../target/unit"} mkdir -p "$REPORT_DIR" diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml index 6d8b465..8a19298 100644 --- a/hadoop-ozone/pom.xml +++ b/hadoop-ozone/pom.xml @@ -397,7 +397,8 @@ <configuration> <forkCount>${testsThreadCount}</forkCount> <reuseForks>false</reuseForks> - <argLine>${maven-surefire-plugin.argLine} -DminiClusterDedicatedDirs=true</argLine> + <!-- @argLine is filled by jacoco maven plugin. @{} means late evaluation --> + <argLine>${maven-surefire-plugin.argLine} @{argLine} -DminiClusterDedicatedDirs=true</argLine> <systemPropertyVariables> <testsThreadCount>${testsThreadCount}</testsThreadCount> <test.build.data>${test.build.data}/${surefire.forkNumber}</test.build.data> diff --git a/pom.xml b/pom.xml index d6e2da6..c8b16c1 100644 --- a/pom.xml +++ b/pom.xml @@ -1670,6 +1670,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs <artifactId>apache-rat-plugin</artifactId> <version>${apache-rat-plugin.version}</version> </plugin> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.8.3</version> + </plugin> </plugins> </pluginManagement> @@ -1760,12 +1765,25 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs </executions> </plugin> <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <executions> + <execution> + <id>default-prepare-agent</id> + <goals> + <goal>prepare-agent</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> <reuseForks>false</reuseForks> <forkedProcessTimeoutInSeconds>${surefire.fork.timeout}</forkedProcessTimeoutInSeconds> - <argLine>${maven-surefire-plugin.argLine}</argLine> + <!-- @argLine is filled by jacoco maven plugin. @{} means late evaluation --> + <argLine>${maven-surefire-plugin.argLine} @{argLine}</argLine> <environmentVariables> <HADOOP_COMMON_HOME>${hadoop.common.build.dir}</HADOOP_COMMON_HOME> <!-- HADOOP_HOME required for tests on Windows to find winutils --> --------------------------------------------------------------------- To unsubscribe, e-mail: ozone-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: ozone-commits-h...@hadoop.apache.org