From bcc0547473a5e4adb09d8d0c55f7e8915dcea6a4 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Wed, 14 May 2008 14:49:28 +0000
Subject: [PATCH] Fix variable/path resolution in SNMP tests
---
opends/tests/shared/functions/snmp.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/tests/shared/functions/snmp.xml b/opends/tests/shared/functions/snmp.xml
index e94a689..e7d30c0 100755
--- a/opends/tests/shared/functions/snmp.xml
+++ b/opends/tests/shared/functions/snmp.xml
@@ -152,7 +152,7 @@
STAFCmd='SNMPGet'
snmpPath = '%s/%s/snmp' % (DIRECTORY_INSTANCE_DIR, relativeJavaDir)
- cp = 'CLASSPATH=%s:%s/jdmkrt.jar:.' % (SNMP_OPENDS_JARFILE, snmpPath)
+ cp = 'CLASSPATH=%s/%s:%s/jdmkrt.jar:.' % (DIRECTORY_INSTANCE_DIR,SNMP_OPENDS_JARFILE, snmpPath)
if isWindows:
cp = cp.replace(':', ';')
@@ -309,7 +309,7 @@
STAFCmd='SNMPSet'
snmpPath = '%s/%s/snmp' % (DIRECTORY_INSTANCE_DIR, relativeJavaDir)
- cp = 'CLASSPATH=%s:%s/jdmkrt.jar:.' % (SNMP_OPENDS_JARFILE, snmpPath)
+ cp = 'CLASSPATH=%s/%s:%s/jdmkrt.jar:.' % (DIRECTORY_INSTANCE_DIR,SNMP_OPENDS_JARFILE, snmpPath)
if isWindows:
cp = cp.replace(':', ';')
@@ -392,7 +392,7 @@
{
'location' : location ,
'type' : 'STRING',
- 'name' : 'STAF/Env/STAF_DIR'
+ 'name' : 'STAF/Config/STAFRoot'
}
</call>
<script>jstaf_jarfile = '%s/lib/JSTAF.jar' % STAFResult</script>
@@ -419,8 +419,8 @@
STAFCmd='SNMPTrapListener'
snmpPath = '%s/%s/snmp' % (DIRECTORY_INSTANCE_DIR, relativeJavaDir)
- cp = 'CLASSPATH=%s:%s/jdmkrt.jar:%s:.' \
- % (SNMP_OPENDS_JARFILE, snmpPath, jstaf_jarfile)
+ cp = 'CLASSPATH=%s/%s:%s/jdmkrt.jar:%s:.' \
+ % (DIRECTORY_INSTANCE_DIR,SNMP_OPENDS_JARFILE, snmpPath, jstaf_jarfile)
if isWindows:
cp = cp.replace(':', ';')
@@ -450,4 +450,4 @@
</sequence>
</function>
-</stax>
\ No newline at end of file
+</stax>
--
Gitblit v1.10.0