From 2fc44fe29f0bf0460005d4a182b5efab1f9fddd4 Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Tue, 01 Apr 2008 16:26:25 +0000
Subject: [PATCH] client: set JAVA_HOME to PATH variable
---
opendj-sdk/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoad.xml | 4 ++--
opendj-sdk/opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml | 4 ++--
opendj-sdk/opends/tests/system-tests/clients/searchLoad/searchLoad.xml | 4 ++--
3 files changed, 6 insertions(+), 6 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 8239a1c..55b2f55 100755
--- a/opendj-sdk/opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml
+++ b/opendj-sdk/opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml
@@ -158,7 +158,7 @@
<command mode="'shell'">'./build.ksh'</command>
<parms/>
<workdir>workingDir</workdir>
- <envs>['PATH=/bin:/usr/bin']</envs>
+ <envs>['PATH=%s:/bin:/usr/bin' % JAVA_HOME]</envs>
<stderr mode="'stdout'"/>
<stdout/>
<returnstdout/>
@@ -210,7 +210,7 @@
<command>'java'</command>
<parms>cParam </parms>
<workdir>workingDir</workdir>
- <envs>['PATH=/bin:/usr/bin']</envs>
+ <envs>['PATH=%s:/bin:/usr/bin' % JAVA_HOME]</envs>
<stderr mode="'stdout'"/>
<stdout>outFile</stdout>
<returnstdout/>
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 b6aac64..b706e94 100755
--- a/opendj-sdk/opends/tests/system-tests/clients/searchLoad/searchLoad.xml
+++ b/opendj-sdk/opends/tests/system-tests/clients/searchLoad/searchLoad.xml
@@ -158,7 +158,7 @@
<command mode="'shell'">'./build.ksh'</command>
<parms/>
<workdir>workingDir</workdir>
- <envs>['PATH=/bin:/usr/bin']</envs>
+ <envs>['PATH=%s:/bin:/usr/bin' % JAVA_HOME]</envs>
<stderr mode="'stdout'"/>
<stdout/>
<returnstdout/>
@@ -208,7 +208,7 @@
<command>'java'</command>
<parms>cParam </parms>
<workdir>workingDir</workdir>
- <envs>['PATH=/bin:/usr/bin']</envs>
+ <envs>['PATH=%s:/bin:/usr/bin' % JAVA_HOME]</envs>
<stderr mode="'stdout'"/>
<stdout>outFile</stdout>
<returnstdout/>
diff --git a/opendj-sdk/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoad.xml b/opendj-sdk/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoad.xml
index 911af7d..bc75862 100755
--- a/opendj-sdk/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoad.xml
+++ b/opendj-sdk/opends/tests/system-tests/scenario/sample2/clients/sampleSearchLoad/sampleSearchLoad.xml
@@ -158,7 +158,7 @@
<command mode="'shell'">'./build.sh'</command>
<parms/>
<workdir>workingDir</workdir>
- <envs>['PATH=/bin:/usr/bin']</envs>
+ <envs>['PATH=%s:/bin:/usr/bin' % JAVA_HOME]</envs>
<stderr mode="'stdout'"/>
<stdout/>
<returnstdout/>
@@ -209,7 +209,7 @@
<command>'java'</command>
<parms>cParam </parms>
<workdir>workingDir</workdir>
- <envs>['PATH=/bin:/usr/bin']</envs>
+ <envs>['PATH=%s:/bin:/usr/bin' % JAVA_HOME]</envs>
<stderr mode="'stdout'"/>
<stdout>outFile</stdout>
<returnstdout/>
--
Gitblit v1.10.0