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

protect logic under skipTests for stupid pom packaging

This commit is contained in:
Robert Muir 2015-07-16 20:49:16 -04:00
parent 96a999d2c7
commit 9e7882e604
4 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/pom.xml
View File

@ -1039,8 +1039,7 @@
</goals>
<configuration>
<target>
<ant antfile="${elasticsearch.tools.directory}/ant/integration-tests.xml"
target="start-external-cluster"/>
<ant antfile="${elasticsearch.integ.antfile}" target="start-external-cluster"/>
</target>
</configuration>
</execution>
@ -1053,13 +1052,9 @@
</goals>
<configuration>
<target>
<ant antfile="${elasticsearch.tools.directory}/ant/integration-tests.xml"
target="stop-external-cluster"/>
<ant antfile="${elasticsearch.integ.antfile}" target="stop-external-cluster"/>
<!-- TODO: remove this and the xslt when junit4 is fixed -->
<xslt in="${project.build.directory}/failsafe-reports/failsafe-summary-buggy.xml"
out="${project.build.directory}/failsafe-reports/failsafe-summary.xml"
style="${elasticsearch.tools.directory}/ant/fixup-failsafe-summary.xslt">
</xslt>
<ant antfile="${elasticsearch.integ.antfile}" target="fixup-failsafe-summary"/>
</target>
</configuration>
</execution>

8
dev-tools/src/main/resources/ant/integration-tests.xml
View File

@ -164,4 +164,12 @@
</exec>
<delete file="${integ.pidfile}"/>
</target>
<!-- TODO: remove this and the xslt when junit4 is fixed -->
<target name="fixup-failsafe-summary" unless="${shouldskip}">
<xslt in="${project.build.directory}/failsafe-reports/failsafe-summary-buggy.xml"
out="${project.build.directory}/failsafe-reports/failsafe-summary.xml"
style="${elasticsearch.tools.directory}/ant/fixup-failsafe-summary.xslt"/>
</target>
</project>

13
plugins/pom.xml
View File

@ -21,8 +21,6 @@
<properties>
<elasticsearch.assembly.descriptor>${basedir}/src/main/assemblies/plugin.xml</elasticsearch.assembly.descriptor>
<elasticsearch.assembly.appendId>false</elasticsearch.assembly.appendId>
<elasticsearch.integ.antfile.default>${elasticsearch.tools.directory}/ant/integration-tests.xml</elasticsearch.integ.antfile.default>
<elasticsearch.integ.antfile>${elasticsearch.integ.antfile.default}</elasticsearch.integ.antfile>
</properties>
<dependencies>
@ -309,8 +307,7 @@
</goals>
<configuration>
<target>
<ant antfile="${elasticsearch.integ.antfile}"
target="start-external-cluster-with-plugin"/>
<ant antfile="${elasticsearch.integ.antfile}" target="start-external-cluster-with-plugin"/>
</target>
</configuration>
</execution>
@ -323,13 +320,9 @@
</goals>
<configuration>
<target>
<ant antfile="${elasticsearch.integ.antfile}"
target="stop-external-cluster"/>
<ant antfile="${elasticsearch.integ.antfile}" target="stop-external-cluster"/>
<!-- TODO: remove this and the xslt when junit4 is fixed -->
<xslt in="${project.build.directory}/failsafe-reports/failsafe-summary-buggy.xml"
out="${project.build.directory}/failsafe-reports/failsafe-summary.xml"
style="${elasticsearch.tools.directory}/ant/fixup-failsafe-summary.xslt">
</xslt>
<ant antfile="${elasticsearch.integ.antfile}" target="fixup-failsafe-summary"/>
</target>
</configuration>
</execution>

2
pom.xml
View File

@ -53,6 +53,8 @@
<elasticsearch.thirdparty.config>unshaded</elasticsearch.thirdparty.config>
<elasticsearch.license.header>${elasticsearch.tools.directory}/license-check/elasticsearch_license_header.txt</elasticsearch.license.header>
<elasticsearch.license.headerDefinition>${elasticsearch.tools.directory}/license-check/license_header_definition.xml</elasticsearch.license.headerDefinition>
<elasticsearch.integ.antfile.default>${elasticsearch.tools.directory}/ant/integration-tests.xml</elasticsearch.integ.antfile.default>
<elasticsearch.integ.antfile>${elasticsearch.integ.antfile.default}</elasticsearch.integ.antfile>
<!-- Test properties -->
<tests.jvms>auto</tests.jvms>