From 462d1b335fd0ad4f73a7cd944b2d45548f87cc8c Mon Sep 17 00:00:00 2001
From: jaymode <jay.modi@elasticsearch.com>
Date: Fri, 31 Jul 2015 14:20:18 -0400
Subject: [PATCH] fix shield integration tests

Original commit: elastic/x-pack-elasticsearch@fb063b5ad1c38dd43a63caef5063378999b30c8c
---
 shield/dev-tools/integration-tests.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/shield/dev-tools/integration-tests.xml b/shield/dev-tools/integration-tests.xml
index b4b6c99728b..d59c1824564 100644
--- a/shield/dev-tools/integration-tests.xml
+++ b/shield/dev-tools/integration-tests.xml
@@ -9,7 +9,7 @@
     <attribute name="args" default="${integ.args}"/>
     <sequential>
       <echo>Starting up external cluster...</echo>
-      <run-script dir="@{home}" script="bin/elasticsearch" spawn="true"
+      <run-script script="@{home}/bin/elasticsearch" spawn="true"
                   args="@{args} -Des.path.repo=@{home}/repo" />
 
       <waitfor maxwait="3" maxwaitunit="minute" checkevery="500">
@@ -23,10 +23,11 @@
   </macrodef>
 
   <target name="start-external-cluster-with-plugin" depends="setup-workspace" unless="${shouldskip}">
+    <local name="home"/>
+    <property name="home" location="${integ.scratch}/elasticsearch-${elasticsearch.version}"/>
     <install-plugin name="elasticsearch-license" file="${integ.deps}/elasticsearch-license-plugin-${project.version}.zip" />
     <install-plugin name="${project.artifactId}" file="${project.build.directory}/releases/${project.artifactId}-${project.version}.zip"/>
-    <run-script dir="${integ.scratch}/elasticsearch-${elasticsearch.version}" script="bin/shield/esusers"
-                args="useradd test_user -p changeme -r admin"/>
+    <run-script script="${home}/bin/shield/esusers" args="useradd test_user -p changeme -r admin"/>
     <startup-elasticsearch/>
 
     <local name="temp.file"/>