From 7ccc3480979b87a09869eb0f8f9bc10c052e6e3f Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Thu, 12 Feb 2009 10:56:36 +0000
Subject: [PATCH] Update the functional tests for package mode (split between install and instance)

---
 opendj-sdk/opends/tests/staf-tests/shared/functions/environment.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/environment.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/environment.xml
index 8203c65..197e16e 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/environment.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/environment.xml
@@ -221,7 +221,7 @@
         <!-- Get Directory Server Variables -->
         <call function="'GetDirectoryServerVars'">
           { 'location'  : STAF_REMOTE_HOSTNAME,
-            'dsPath'    : '%s' % InstanceInstallDir  }
+            'dsPath'    : '%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)  }
         </call>
 
         <if expr="RC != 0">
@@ -401,11 +401,11 @@
       </message>
       <call function="'deleteFolder'">
         { 'location'   : STAF_REMOTE_HOSTNAME ,
-          'foldername' : DIRECTORY_INSTANCE_DIR }
+          'foldername' : '%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME) }
       </call>
       <call function="'createFolder'">
         { 'location'   : STAF_REMOTE_HOSTNAME ,
-          'foldername' : DIRECTORY_INSTANCE_DIR }
+          'foldername' : '%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME) }
       </call>
 
       <call function="'GetDirectoryServerInformation'"/>

--
Gitblit v1.10.0