From 8310417a85804a034b2b5b58bc9f48d0687f829b Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Tue, 13 May 2008 10:24:20 +0000
Subject: [PATCH] Add tests for SNMP feature

---
 opends/tests/shared/functions/ldap.xml |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/opends/tests/shared/functions/ldap.xml b/opends/tests/shared/functions/ldap.xml
index 9c43312..08c42fe 100755
--- a/opends/tests/shared/functions/ldap.xml
+++ b/opends/tests/shared/functions/ldap.xml
@@ -1098,8 +1098,7 @@
           'command'   : STAFCmd,
           'arguments' : STAFCmdParams,
           'location'  : location,
-          'outputFile': outputFile,
-          'outputPath': outputPath,
+          'outputFile': '%s/%s' % (outputPath, outputFile) ,
           'expectedRC': expectedRC ,
           'logStderr' : logStderr
         }
@@ -2716,8 +2715,8 @@
           'command'   : '%s/bin/java' % JAVA_HOME,
           'arguments' : '%s %s' % (STAFCmd,STAFCmdParams),
           'location'  : location,
-          'path'      : '%s/../%s' % (dsPath,relativeJavaDir),
-          'env'       : ['PATH=/bin:/usr/bin:%s/bin' % dsPath, 'JAVA_HOME=%s' % JAVA_HOME,'CLASSPATH=%s/../%s' % (dsPath,relativeJavaDir)],
+          'path'      : '%s/../%s/ldap' % (dsPath,relativeJavaDir),
+          'env'       : ['PATH=/bin:/usr/bin:%s/bin' % dsPath, 'JAVA_HOME=%s' % JAVA_HOME,'CLASSPATH=%s/../%s/ldap' % (dsPath,relativeJavaDir)],
           'expectedRC': expectedRC
         }
       </call>
@@ -2959,8 +2958,8 @@
           'command'   : '%s/bin/java' % JAVA_HOME,
           'arguments' : '%s %s' % (STAFCmd,STAFCmdParams),
           'location'  : location,
-          'env'       : ['PATH=/bin:/usr/bin:%s/bin' % dsPath, 'JAVA_HOME=%s' % JAVA_HOME,'CLASSPATH=%s/../%s' % (dsPath,relativeJavaDir)],
-          'path'      : '%s/../%s' % (dsPath,relativeJavaDir),
+          'env'       : ['PATH=/bin:/usr/bin:%s/bin' % dsPath, 'JAVA_HOME=%s' % JAVA_HOME,'CLASSPATH=%s/../%s/ldap' % (dsPath,relativeJavaDir)],
+          'path'      : '%s/../%s/ldap' % (dsPath,relativeJavaDir),
           'expectedRC': expectedRC
         }
       </call>

--
Gitblit v1.10.0