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

Fix integration tests and gradle run to work on windoze

This commit is contained in:
Robert Muir 2015-11-29 07:39:18 -08:00
parent 609d9db470
commit a01f86aaac
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy
View File

@ -285,11 +285,8 @@ class ClusterFormationTasks {
/** Adds a task to start an elasticsearch node with the given configuration */ /** Adds a task to start an elasticsearch node with the given configuration */
static Task configureStartTask(String name, Project project, Task setup, NodeInfo node) { static Task configureStartTask(String name, Project project, Task setup, NodeInfo node) {
String executable String executable
List<String> esArgs = []
if (Os.isFamily(Os.FAMILY_WINDOWS)) { if (Os.isFamily(Os.FAMILY_WINDOWS)) {
executable = 'cmd' executable = 'cmd'
esArgs.add('/C')
esArgs.add('call')
} else { } else {
executable = 'sh' executable = 'sh'
} }
@ -326,6 +323,9 @@ class ClusterFormationTasks {
ant.exec(executable: executable, spawn: node.config.daemonize, dir: node.cwd, taskname: 'elasticsearch') { ant.exec(executable: executable, spawn: node.config.daemonize, dir: node.cwd, taskname: 'elasticsearch') {
node.env.each { key, value -> env(key: key, value: value) } node.env.each { key, value -> env(key: key, value: value) }
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
arg(value: '/C')
}
arg(value: script) arg(value: script)
node.args.each { arg(value: it) } node.args.each { arg(value: it) }
} }