From 2c94abd6b772c2e23fd7a7eb21b3aceb7638160b Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Fri, 04 Apr 2008 12:31:12 +0000
Subject: [PATCH] update following new client management
---
opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/build.sh | 6 ++++--
opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoad.xml | 31 ++++++++-----------------------
2 files changed, 12 insertions(+), 25 deletions(-)
diff --git a/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/build.sh b/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/build.sh
index bc9e44d..3649964 100755
--- a/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/build.sh
+++ b/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/build.sh
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/bin/sh
# CDDL HEADER START
#
@@ -26,10 +26,12 @@
# Copyright 2008 Sun Microsystems, Inc.
export CLASSPATH=$CLASSPATH:../../../../clients/LDAPjdk/ldapjdk.jar
+mkdir -p $COMPILDIR
echo "Compiling classes..."
-javac src/*.java -d .
+javac src/*.java -d $COMPILDIR
[ $? -ne 0 ] && return 1
echo "Creating jarfile"
+cd $COMPILDIR
jar cvf search.jar *.class
[ $? -ne 0 ] && return 1
echo "Cleanup"
diff --git a/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoad.xml b/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoad.xml
index bc75862..99f1c05 100755
--- a/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoad.xml
+++ b/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoad.xml
@@ -62,7 +62,10 @@
<!-- get the ldap instance parameters -->
<script>
- outFile = '%s/client_sampleSearchLoad_%s.txt' % (LOG_DIR,client.getId())
+ compilDir = '%s/%s_%s' % (workingDir,client.getHost(),client.getId())
+
+ outFile = '%s/client_sampleSearchLoad_id%s.txt' % \
+ (client.getLogDir(),client.getId())
cParams = client.getParams()
serverInstanceFromClient = cParams[0][1]
baseDn = cParams[1][1]
@@ -153,12 +156,14 @@
</call>
+ <!-- Build Client in unique directory (compilDir), avoid -->
+ <!-- conflict if same client is run several time at the same time -->
<process name="'%s: build %s' % (client.getHost(),client.getName())">
<location>client.getHost()</location>
<command mode="'shell'">'./build.sh'</command>
<parms/>
<workdir>workingDir</workdir>
- <envs>['PATH=%s:/bin:/usr/bin' % JAVA_HOME]</envs>
+ <envs>['PATH=%s:/bin:/usr/bin' % JAVA_HOME,'COMPILDIR=%s' % compilDir]</envs>
<stderr mode="'stdout'"/>
<stdout/>
<returnstdout/>
@@ -197,7 +202,7 @@
cParam = '%s -XX:NewRatio=1 -XX:SurvivorRatio=100' % cParam
cParam = '%s -cp %s/clients/LDAPjdk/ldapjdk.jar' % \
(cParam,LOCAL_TESTS_DIR)
- cParam = '%s:%s/search.jar' % (cParam,workingDir)
+ cParam = '%s:%s/search.jar' % (cParam,compilDir)
cParam = '%s Client %s' % (cParam,parms)
titleName = '%s: run %s on %s' % \
@@ -250,26 +255,6 @@
'fileFd' : fileFd}
</call>
- <!-- ==== Copy output file in main log directory ==== -->
- <script>
- clientHostFullName = '%s%s' % (client.getHost(),DOMAIN[0])
- </script>
- <if expr="clientHostFullName != STAXServiceMachine">
- <sequence>
- <call function="'copyFile'">
- {
- 'location' : client.getHost(),
- 'remoteHost' : STAXServiceMachine,
- 'srcFile' : outFile,
- 'destFile' : outFile,
- 'fileFd' : fileFd
- }
- </call>
- <script>
- errNum += STAXResult[0]
- </script>
- </sequence>
- </if>
</sequence>
</else>
</if>
--
Gitblit v1.10.0