From b017349867f2c33f0a671a3fefacd6774dcbace2 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Mon, 24 Nov 2008 10:14:34 +0000
Subject: [PATCH] Fix for Issue 3025: results should be the same on all OS/platforms

---
 opends/tests/staf-tests/shared/functions/snmp.xml |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/opends/tests/staf-tests/shared/functions/snmp.xml b/opends/tests/staf-tests/shared/functions/snmp.xml
index c0f9623..65390d1 100755
--- a/opends/tests/staf-tests/shared/functions/snmp.xml
+++ b/opends/tests/staf-tests/shared/functions/snmp.xml
@@ -190,8 +190,8 @@
         'command'    : '%s/bin/java' % JAVA_HOME ,
         'arguments'  : '%s %s' % (STAFCmd, STAFCmdParams) ,
         'location'   : location ,
-        'path'       : '%s/snmp' % remote.java,
-        'env'        : env ,
+        'path'       : '%s/snmp' % remote.java ,
+        'envCmd'     : env ,
         'expectedRC' : expectedRC
         }
       </call>
@@ -358,8 +358,8 @@
         'command'    : '%s/bin/java' % JAVA_HOME ,
         'arguments'  : '%s %s' % (STAFCmd, STAFCmdParams) ,
         'location'   : location ,
-        'path'       : '%s/snmp' % remote.java,
-        'env'        : env ,
+        'path'       : '%s/snmp' % remote.java ,
+        'envCmd'     : env ,
         'expectedRC' : expectedRC
         }
       </call>
@@ -434,7 +434,7 @@
       </call>
       <script>
         if is_windows_platform(location):
-          jstaf_jarfile='%s\\bin\\JSTAF.jar' % STAFResult
+          jstaf_jarfile='%s\bin\JSTAF.jar' % STAFResult
         else:
           jstaf_jarfile='%s/lib/JSTAF.jar' % STAFResult
       </script>
@@ -485,7 +485,7 @@
         'arguments'  : '%s %s' % (STAFCmd, STAFCmdParams) ,
         'location'   : location ,
         'path'       : snmpPath ,
-        'env'        : env ,
+        'envCmd'     : env ,
         'outputFile' : outputFile ,
         'expectedRC' : expectedRC
         }

--
Gitblit v1.10.0