From c14e6cb01ca2b8624d4c133f6f109c17510f90a6 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Thu, 05 Jun 2008 18:26:08 +0000
Subject: [PATCH] Fix SNMP tests on Windows (EOL character, location of JSTAF.jar) + add testcase for issue 3308
---
opends/tests/shared/functions/snmp.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/opends/tests/shared/functions/snmp.xml b/opends/tests/shared/functions/snmp.xml
index 1f0c4c0..a6564fa 100755
--- a/opends/tests/shared/functions/snmp.xml
+++ b/opends/tests/shared/functions/snmp.xml
@@ -432,7 +432,12 @@
'name' : 'STAF/Config/STAFRoot'
}
</call>
- <script>jstaf_jarfile = '%s/lib/JSTAF.jar' % STAFResult</script>
+ <script>
+ if is_windows_platform(location):
+ jstaf_jarfile='%s\\bin\\JSTAF.jar' % STAFResult
+ else:
+ jstaf_jarfile='%s/lib/JSTAF.jar' % STAFResult
+ </script>
<!-- Build the command -->
<script>
--
Gitblit v1.10.0