From 2c75a66eecd23abca4d3e0cfd9c24aaecb029114 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Fri, 02 Mar 2007 11:28:36 +0000
Subject: [PATCH] Issue 1307 bin is missing from dsPath for commands envs
---
opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml b/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml
index 15d383e..bd0ce56 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml
@@ -122,9 +122,9 @@
<location>'%s' % location</location>
<command>'%s' % STAFCmd</command>
<parms>'%s' % STAFCmdParams</parms>
- <workdir>'%s' % dsPath</workdir>
+ <workdir>'%s/bin' % dsPath</workdir>
<envs>
- ['PATH=/bin:/usr/bin:%s' % dsPath, 'JAVA_HOME=%s' % JAVA_HOME]
+ ['PATH=/bin:/usr/bin:%s/bin' % dsPath, 'JAVA_HOME=%s' % JAVA_HOME]
</envs>
<console use="'same'"/>
<stderr mode="'stdout'"/>
@@ -220,9 +220,9 @@
<location>'%s' % location</location>
<command>'%s' % STAFCmd</command>
<parms>'%s' % STAFCmdParams</parms>
- <workdir>'%s' % dsPath</workdir>
+ <workdir>'%s/bin' % dsPath</workdir>
<envs>
- ['PATH=/bin:/usr/bin:%s' % dsPath, 'JAVA_HOME=%s' % JAVA_HOME]
+ ['PATH=/bin:/usr/bin:%s/bin' % dsPath, 'JAVA_HOME=%s' % JAVA_HOME]
</envs>
<console use="'same'"/>
<stderr mode="'stdout'"/>
@@ -460,9 +460,9 @@
<location>'%s' % (location)</location>
<command>'%s' % (STAFCmd)</command>
<parms>'%s' % (STAFCmdParams)</parms>
- <workdir>'%s' % dsPath</workdir>
+ <workdir>'%s/bin' % dsPath</workdir>
<envs>
- ['PATH=/bin:/usr/bin:%s' % dsPath, 'JAVA_HOME=%s' % JAVA_HOME]
+ ['PATH=/bin:/usr/bin:%s/bin' % dsPath, 'JAVA_HOME=%s' % JAVA_HOME]
</envs>
<stderr mode="'stdout'"/>
<returnstdout/>
--
Gitblit v1.10.0