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

Merge pull request #14904 from nik9000/no_windows_deb_tests 

Skip package tests on windows
This commit is contained in:
Nik Everett 2015-11-20 14:58:44 -05:00
parent df9cd96e9f 452d85e582
commit 7596fdc999
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distribution/build.gradle
View File

@ -18,6 +18,7 @@
*/ */
import org.apache.tools.ant.filters.FixCrLfFilter import org.apache.tools.ant.filters.FixCrLfFilter
import org.apache.tools.ant.taskdefs.condition.Os
import org.elasticsearch.gradle.precommit.DependencyLicensesTask import org.elasticsearch.gradle.precommit.DependencyLicensesTask
import org.elasticsearch.gradle.test.RunTask import org.elasticsearch.gradle.test.RunTask
import org.elasticsearch.gradle.EmptyDirTask import org.elasticsearch.gradle.EmptyDirTask
@ -142,6 +143,7 @@ configure(subprojects.findAll { it.name == 'zip' || it.name == 'tar' }) {
* MavenFilteringHack or any other copy-style action. * MavenFilteringHack or any other copy-style action.
*/ */
configure(subprojects.findAll { it.name == 'deb' || it.name == 'rpm' }) { configure(subprojects.findAll { it.name == 'deb' || it.name == 'rpm' }) {
integTest.enabled = Os.isFamily(Os.FAMILY_WINDOWS) == false
File packagingFiles = new File(buildDir, 'packaging') File packagingFiles = new File(buildDir, 'packaging')
project.ext.packagingFiles = packagingFiles project.ext.packagingFiles = packagingFiles
task processPackagingFiles(type: Copy) { task processPackagingFiles(type: Copy) {