From a70d9b048257947d020d7b781a0c24ebdfa64689 Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Fri, 28 Mar 2008 11:42:44 +0000
Subject: [PATCH] update clients following new interface

---
 opendj-sdk/opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml |   10 ++++++----
 opendj-sdk/opends/tests/system-tests/clients/restartDs/restartDs.xml   |    2 ++
 opendj-sdk/opends/tests/system-tests/clients/searchLoad/searchLoad.xml |   10 ++++++----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/opendj-sdk/opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml b/opendj-sdk/opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml
index d6d0ef3..8239a1c 100755
--- a/opendj-sdk/opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml
+++ b/opendj-sdk/opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml
@@ -34,6 +34,8 @@
   <!-- ************************************************************ -->
   <function name="modifyLoad" scope="local">
     <function-map-args>
+      <function-arg-def name="workingDir" type="required">
+      </function-arg-def>
       <function-arg-def name="client" type="required">
       </function-arg-def>
       <function-arg-def name="instances" type="required">
@@ -124,7 +126,7 @@
             <location>client.getHost()</location>
             <command mode="'shell'">'chmod +x build.ksh'</command>
             <parms/>
-            <workdir>'%s/clients/modifyLoad' % LOCAL_TESTS_DIR</workdir>
+            <workdir>workingDir</workdir>
             <envs>['PATH=/bin:/usr/bin']</envs>
             <stderr mode="'stdout'"/>
             <stdout/>
@@ -155,7 +157,7 @@
             <location>client.getHost()</location>
             <command mode="'shell'">'./build.ksh'</command>
             <parms/>
-            <workdir>'%s/clients/modifyLoad' % LOCAL_TESTS_DIR</workdir>
+            <workdir>workingDir</workdir>
             <envs>['PATH=/bin:/usr/bin']</envs>
             <stderr mode="'stdout'"/>
             <stdout/>
@@ -169,7 +171,7 @@
           <if expr="RC != 0">
             <message>
               'FAILED to build client %s on %s' % \
-              (client.getHost(),client.getName())
+              (client.getName(),client.getHost())
             </message>
           </if>
           <script>
@@ -207,7 +209,7 @@
             <location>client.getHost()</location>
             <command>'java'</command>
             <parms>cParam </parms>
-            <workdir>'%s/clients/searchLoad' % LOCAL_TESTS_DIR</workdir>
+            <workdir>workingDir</workdir>
             <envs>['PATH=/bin:/usr/bin']</envs>
             <stderr mode="'stdout'"/>
             <stdout>outFile</stdout>
diff --git a/opendj-sdk/opends/tests/system-tests/clients/restartDs/restartDs.xml b/opendj-sdk/opends/tests/system-tests/clients/restartDs/restartDs.xml
index 41737d2..f387064 100755
--- a/opendj-sdk/opends/tests/system-tests/clients/restartDs/restartDs.xml
+++ b/opendj-sdk/opends/tests/system-tests/clients/restartDs/restartDs.xml
@@ -34,6 +34,8 @@
   <!-- ************************************************************ -->
   <function name="restartDs" scope="local">
     <function-map-args>
+      <function-arg-def name="workingDir" type="required">
+      </function-arg-def>
       <function-arg-def name="client" type="required">
       </function-arg-def>
       <function-arg-def name="instances" type="required">
diff --git a/opendj-sdk/opends/tests/system-tests/clients/searchLoad/searchLoad.xml b/opendj-sdk/opends/tests/system-tests/clients/searchLoad/searchLoad.xml
index 9209b8d..b6aac64 100755
--- a/opendj-sdk/opends/tests/system-tests/clients/searchLoad/searchLoad.xml
+++ b/opendj-sdk/opends/tests/system-tests/clients/searchLoad/searchLoad.xml
@@ -34,6 +34,8 @@
   <!-- ************************************************************ -->
   <function name="searchLoad" scope="local">
     <function-map-args>
+      <function-arg-def name="workingDir" type="required">
+      </function-arg-def>
       <function-arg-def name="client" type="required">
       </function-arg-def>
       <function-arg-def name="instances" type="required">
@@ -124,7 +126,7 @@
             <location>client.getHost()</location>
             <command mode="'shell'">'chmod +x build.ksh'</command>
             <parms/>
-            <workdir>'%s/clients/searchLoad' % LOCAL_TESTS_DIR</workdir>
+            <workdir>workingDir</workdir>
             <envs>['PATH=/bin:/usr/bin']</envs>
             <stderr mode="'stdout'"/>
             <stdout/>
@@ -155,7 +157,7 @@
             <location>client.getHost()</location>
             <command mode="'shell'">'./build.ksh'</command>
             <parms/>
-            <workdir>'%s/clients/searchLoad' % LOCAL_TESTS_DIR</workdir>
+            <workdir>workingDir</workdir>
             <envs>['PATH=/bin:/usr/bin']</envs>
             <stderr mode="'stdout'"/>
             <stdout/>
@@ -169,7 +171,7 @@
           <if expr="RC != 0">
             <message>
               'FAILED to build client %s on %s' % \
-              (client.getHost(),client.getName())
+              (client.getName(),client.getHost())
             </message>
           </if>
           <script>
@@ -205,7 +207,7 @@
             <location>client.getHost()</location>
             <command>'java'</command>
             <parms>cParam </parms>
-            <workdir>'%s/clients/searchLoad' % LOCAL_TESTS_DIR</workdir>
+            <workdir>workingDir</workdir>
             <envs>['PATH=/bin:/usr/bin']</envs>
             <stderr mode="'stdout'"/>
             <stdout>outFile</stdout>

--
Gitblit v1.10.0