From a01f86aaac94e8d4e00d4e9336126943ab4ff921 Mon Sep 17 00:00:00 2001
From: Robert Muir <rmuir@apache.org>
Date: Sun, 29 Nov 2015 07:39:18 -0800
Subject: [PATCH] Fix integration tests and gradle run to work on windoze

---
 .../elasticsearch/gradle/test/ClusterFormationTasks.groovy  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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