From fef355f25113efb46ca3e8c31d9449ebce56e829 Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Wed, 09 Apr 2008 08:45:14 +0000
Subject: [PATCH] clients: specify appropriate java path
---
opends/tests/system-tests/clients/searchLoad/searchLoad.xml | 6 +++---
opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml | 6 +++---
opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoad.xml | 6 +++---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml b/opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml
index 48169bb..a961aef 100755
--- a/opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml
+++ b/opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml
@@ -163,7 +163,7 @@
<command mode="'shell'">'./build.ksh'</command>
<parms/>
<workdir>workingDir</workdir>
- <envs>['PATH=%s:/bin:/usr/bin' % JAVA_HOME,'COMPILDIR=%s' % compilDir]</envs>
+ <envs>['PATH=%s/bin:/bin:/usr/bin' % JAVA_HOME,'COMPILDIR=%s' % compilDir]</envs>
<stderr mode="'stdout'"/>
<stdout/>
<returnstdout/>
@@ -211,10 +211,10 @@
</script>
<process name="'%s' % titleName">
<location>client.getHost()</location>
- <command>'java'</command>
+ <command>'%s/bin/java' % JAVA_HOME</command>
<parms>cParam </parms>
<workdir>workingDir</workdir>
- <envs>['PATH=%s:/bin:/usr/bin' % JAVA_HOME]</envs>
+ <envs>['PATH=%s/bin:/bin:/usr/bin' % JAVA_HOME]</envs>
<stderr mode="'stdout'"/>
<stdout>outFile</stdout>
<returnstdout/>
diff --git a/opends/tests/system-tests/clients/searchLoad/searchLoad.xml b/opends/tests/system-tests/clients/searchLoad/searchLoad.xml
index 0f5f7ed..d39afb3 100755
--- a/opends/tests/system-tests/clients/searchLoad/searchLoad.xml
+++ b/opends/tests/system-tests/clients/searchLoad/searchLoad.xml
@@ -163,7 +163,7 @@
<command mode="'shell'">'./build.ksh'</command>
<parms/>
<workdir>workingDir</workdir>
- <envs>['PATH=%s:/bin:/usr/bin' % JAVA_HOME,'COMPILDIR=%s' % compilDir ]</envs>
+ <envs>['PATH=%s/bin:/bin:/usr/bin' % JAVA_HOME,'COMPILDIR=%s' % compilDir ]</envs>
<stderr mode="'stdout'"/>
<stdout/>
<returnstdout/>
@@ -210,10 +210,10 @@
</script>
<process name="'%s' % titleName">
<location>client.getHost()</location>
- <command>'java'</command>
+ <command>'%s/bin/java' % JAVA_HOME</command>
<parms>cParam </parms>
<workdir>workingDir</workdir>
- <envs>['PATH=%s:/bin:/usr/bin' % JAVA_HOME]</envs>
+ <envs>['PATH=%s/bin:/bin:/usr/bin' % JAVA_HOME]</envs>
<stderr mode="'stdout'"/>
<stdout>outFile</stdout>
<returnstdout/>
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 99f1c05..faaa510 100755
--- a/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoad.xml
+++ b/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoad.xml
@@ -163,7 +163,7 @@
<command mode="'shell'">'./build.sh'</command>
<parms/>
<workdir>workingDir</workdir>
- <envs>['PATH=%s:/bin:/usr/bin' % JAVA_HOME,'COMPILDIR=%s' % compilDir]</envs>
+ <envs>['PATH=%s/bin:/bin:/usr/bin' % JAVA_HOME,'COMPILDIR=%s' % compilDir]</envs>
<stderr mode="'stdout'"/>
<stdout/>
<returnstdout/>
@@ -211,10 +211,10 @@
</script>
<process name="'%s' % titleName">
<location>client.getHost()</location>
- <command>'java'</command>
+ <command>'%s/bin/java' % JAVA_HOME</command>
<parms>cParam </parms>
<workdir>workingDir</workdir>
- <envs>['PATH=%s:/bin:/usr/bin' % JAVA_HOME]</envs>
+ <envs>['PATH=%s/bin:/bin:/usr/bin' % JAVA_HOME]</envs>
<stderr mode="'stdout'"/>
<stdout>outFile</stdout>
<returnstdout/>
--
Gitblit v1.10.0