From 81d946b859f7a72ad15d739268afacd6da8a90de Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Fri, 11 Apr 2008 09:08:30 +0000
Subject: [PATCH] fix StartDsWithScript and a call
---
opendj-sdk/opends/tests/system-tests/phases/shared/functions/opendsadm.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/tests/system-tests/phases/shared/functions/opendsadm.xml b/opendj-sdk/opends/tests/system-tests/phases/shared/functions/opendsadm.xml
index 617465f..a43c005 100755
--- a/opendj-sdk/opends/tests/system-tests/phases/shared/functions/opendsadm.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/shared/functions/opendsadm.xml
@@ -285,8 +285,8 @@
STAFCmdParams=' '.join(STAFCmdParamsList)
</script>
- <!-- define environment variables -->
<script>
+ # define environment variables
env = []
env.append('PATH=/bin:/usr/bin:%s' % dsBinPath)
env.append('JAVA_HOME=%s' % JAVA_HOME)
@@ -298,10 +298,12 @@
tuning = instance.getTuning()
if tuning.getJavaArgs() != NOT_DEFINED:
env.append('OPENDS_JAVA_ARGS=%s' % tuning.getJavaArgs())
+ name = 'StartDs %s:%s' % (instance.getName(),instance.getLDAPPort())
+ else:
+ name = 'StartDs'
</script>
<call function="'runCommand'">
- { 'name' : 'StartDs %s:%s' % \
- (instance.getName(),instance.getLDAPPort()),
+ { 'name' : name,
'location' : location,
'command' : STAFCmd,
'arguments' : STAFCmdParams,
--
Gitblit v1.10.0