honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13263 from rmuir/improve_jacoco 

Improve jacoco coverage
This commit is contained in:
Robert Muir 2015-09-01 22:39:59 -04:00
parent 517f00b048 abec2679f0
commit 2a129f1868
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/test/java/org/elasticsearch/bootstrap/BootstrapForTesting.java
View File

@ -106,6 +106,13 @@ public class BootstrapForTesting {
if (Strings.hasLength(System.getProperty("tests.config"))) { if (Strings.hasLength(System.getProperty("tests.config"))) {
perms.add(new FilePermission(System.getProperty("tests.config"), "read,readlink")); perms.add(new FilePermission(System.getProperty("tests.config"), "read,readlink"));
} }
// jacoco coverage output file
if (Boolean.getBoolean("tests.coverage")) {
Path coverageDir = PathUtils.get(System.getProperty("tests.coverage.dir"));
perms.add(new FilePermission(coverageDir.resolve("jacoco.exec").toString(), "read,write"));
// in case we get fancy and use the -integration goals later:
perms.add(new FilePermission(coverageDir.resolve("jacoco-it.exec").toString(), "read,write"));
}
Policy.setPolicy(new ESPolicy(perms)); Policy.setPolicy(new ESPolicy(perms));
System.setSecurityManager(new TestSecurityManager()); System.setSecurityManager(new TestSecurityManager());
Security.selfTest(); Security.selfTest();

7
pom.xml
View File

@ -47,7 +47,7 @@
<jackson.version>2.5.3</jackson.version> <jackson.version>2.5.3</jackson.version>
<slf4j.version>1.6.2</slf4j.version> <slf4j.version>1.6.2</slf4j.version>
<log4j.version>1.2.17</log4j.version> <log4j.version>1.2.17</log4j.version>
<jacoco.version>0.7.2.201409121644</jacoco.version> <jacoco.version>0.7.5.201505241946</jacoco.version>
<elasticsearch.s3.repository>s3://download.elasticsearch.org/elasticsearch/staging/</elasticsearch.s3.repository> <elasticsearch.s3.repository>s3://download.elasticsearch.org/elasticsearch/staging/</elasticsearch.s3.repository>
<!-- Build resources properties --> <!-- Build resources properties -->
@ -646,6 +646,8 @@
<tests.showSuccess>${tests.showSuccess}</tests.showSuccess> <tests.showSuccess>${tests.showSuccess}</tests.showSuccess>
<tests.thirdparty>${tests.thirdparty}</tests.thirdparty> <tests.thirdparty>${tests.thirdparty}</tests.thirdparty>
<tests.config>${tests.config}</tests.config> <tests.config>${tests.config}</tests.config>
<tests.coverage>${tests.coverage}</tests.coverage>
<tests.coverage.dir>${project.build.directory}</tests.coverage.dir>
<tests.client.ratio>${tests.client.ratio}</tests.client.ratio> <tests.client.ratio>${tests.client.ratio}</tests.client.ratio>
<tests.enable_mock_modules>${tests.enable_mock_modules}</tests.enable_mock_modules> <tests.enable_mock_modules>${tests.enable_mock_modules}</tests.enable_mock_modules>
<tests.assertion.disabled>${tests.assertion.disabled}</tests.assertion.disabled> <tests.assertion.disabled>${tests.assertion.disabled}</tests.assertion.disabled>
@ -1415,7 +1417,8 @@ org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UT
</property> </property>
</activation> </activation>
<properties> <properties>
<tests.security.manager>false</tests.security.manager> <!-- security policy doesn't have appropriate permissions for instrumentation --> <!-- in case activated otherwise -->
<tests.coverage>true</tests.coverage>
</properties> </properties>
<build> <build>
<plugins> <plugins>