From 8e68b9626c70a31c6f5a075a9c8be3840efe2455 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Mon, 26 May 2008 08:30:57 +0000
Subject: [PATCH] Fix problem with SNMP tests on Windows and add timeout for trap tests
---
opends/tests/shared/functions/snmp.xml | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/opends/tests/shared/functions/snmp.xml b/opends/tests/shared/functions/snmp.xml
index 39f75f5..bb7000b 100755
--- a/opends/tests/shared/functions/snmp.xml
+++ b/opends/tests/shared/functions/snmp.xml
@@ -151,11 +151,16 @@
STAFCmd='SNMPGet'
+ if is_windows_platform(location):
+ separator=';'
+ else:
+ separator=':'
+
opends_jarfile='%s/%s' % (DIRECTORY_INSTANCE_DIR,SNMP_OPENDS_JARFILE)
snmpPath='%s/%s/snmp' % (DIRECTORY_INSTANCE_DIR, relativeJavaDir)
jdmk_jarfile='%s/jdmkrt.jar' % snmpPath
cp = 'CLASSPATH=%s%s%s%s.' \
- % (opends_jarfile,pathSeparator,jdmk_jarfile,pathSeparator)
+ % (opends_jarfile,separator,jdmk_jarfile,separator)
env = ['JAVA_HOME=%s' % JAVA_HOME, '%s' % cp]
</script>
@@ -308,11 +313,16 @@
STAFCmd='SNMPSet'
+ if is_windows_platform(location):
+ separator=';'
+ else:
+ separator=':'
+
opends_jarfile='%s/%s' % (DIRECTORY_INSTANCE_DIR,SNMP_OPENDS_JARFILE)
snmpPath='%s/%s/snmp' % (DIRECTORY_INSTANCE_DIR, relativeJavaDir)
jdmk_jarfile='%s/jdmkrt.jar' % snmpPath
cp = 'CLASSPATH=%s%s%s%s.' \
- % (opends_jarfile,pathSeparator,jdmk_jarfile,pathSeparator)
+ % (opends_jarfile,separator,jdmk_jarfile,separator)
env = ['JAVA_HOME=%s' % JAVA_HOME, '%s' % cp]
</script>
@@ -417,12 +427,17 @@
STAFCmdParams=' '.join(STAFCmdParamsList)
STAFCmd='SNMPTrapListener'
-
+
+ if is_windows_platform(location):
+ separator=';'
+ else:
+ separator=':'
+
opends_jarfile='%s/%s' % (DIRECTORY_INSTANCE_DIR,SNMP_OPENDS_JARFILE)
snmpPath='%s/%s/snmp' % (DIRECTORY_INSTANCE_DIR, relativeJavaDir)
jdmk_jarfile='%s/jdmkrt.jar' % snmpPath
cp = 'CLASSPATH=%s%s%s%s%s%s.' \
- % (opends_jarfile,pathSeparator,jdmk_jarfile,pathSeparator,jstaf_jarfile,pathSeparator)
+ % (opends_jarfile,separator,jdmk_jarfile,separator,jstaf_jarfile,separator)
env = ['JAVA_HOME=%s' % JAVA_HOME, '%s' % cp]
</script>
--
Gitblit v1.10.0