From aea86376c715c71696d1472dbd3f23173c42116c Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Mon, 18 Jun 2007 19:30:21 +0000
Subject: [PATCH] Issue 1796 use setup -n on windows to avoid service issues
---
opends/tests/functional-tests/shared/functions/topology.xml | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/opends/tests/functional-tests/shared/functions/topology.xml b/opends/tests/functional-tests/shared/functions/topology.xml
index d022c3f..0cedd08 100755
--- a/opends/tests/functional-tests/shared/functions/topology.xml
+++ b/opends/tests/functional-tests/shared/functions/topology.xml
@@ -400,20 +400,38 @@
'unzipdir' : dsDir }
</call>
+ <!-- fixMe: Windows Services are not enabled -->
+ <if expr="isWindows">
+
+ <script>
+ noWindowsService='true'
+ </script>
+
+ <else>
+
+ <script>
+ noWindowsService=''
+ </script>
+
+ </else>
+ </if>
+
<!--- Set up DS -->
<message>
'Set up DS on %s : %s/%s' % (dsHost,dsDir,OPENDSNAME)
</message>
+
<call function="'SetUpDsWithScript'">
- { 'location' : dsHost,
- 'dsPath' : '%s/%s' % (dsDir, OPENDSNAME),
- 'dsPort' : dsPort,
- 'dsJmxPort' : dsJmxPort,
- 'dsBindDN' : dsBindDN,
- 'dsBindPwd' : dsBindPwd,
- 'dsBaseDN' : dsBaseDN }
+ { 'location' : dsHost,
+ 'dsPath' : '%s/%s' % (dsDir, OPENDSNAME),
+ 'dsPort' : dsPort,
+ 'dsJmxPort' : dsJmxPort,
+ 'dsBindDN' : dsBindDN,
+ 'dsBindPwd' : dsBindPwd,
+ 'dsBaseDN' : dsBaseDN,
+ 'dsNoWindowsService' : noWindowsService }
</call>
-
+
<call function="'checkRC'">
{ 'returncode' : RC ,
'result' : STAXResult }
--
Gitblit v1.10.0