From 8a2e109ceb3c6f6053b845d43ce74f284b8766ca Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Mon, 19 May 2008 17:53:33 +0000
Subject: [PATCH] Fix SNMP tests compilation issue on Windows
---
opends/tests/shared/functions/utils.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/opends/tests/shared/functions/utils.xml b/opends/tests/shared/functions/utils.xml
index 69d6c10..b0846dd 100755
--- a/opends/tests/shared/functions/utils.xml
+++ b/opends/tests/shared/functions/utils.xml
@@ -1486,7 +1486,7 @@
_id = '%s#%d' % (strftime('%Y-%m-%d %H:%M:%S',localtime()),random.randint(0,999))
if not env:
- if isWindows:
+ if is_windows_platform(location):
env=['PATH=C:\Windows;C:\Windows\system32;%s' % dsPath, 'JAVA_HOME=%s' % JAVA_HOME]
else:
env=['PATH=/bin:/usr/bin:%s' % dsPath, 'JAVA_HOME=%s' % JAVA_HOME]
@@ -1613,7 +1613,7 @@
</call>
<script>
- if isWindows:
+ if is_windows_platform(location):
_cmd = 'tskill'
_args = STAXResult
else:
@@ -2029,10 +2029,10 @@
cp = 'CLASSPATH=%s:.' % classpath
else:
cp = 'CLASSPATH=.'
-
- if isWindows:
+
+ if is_windows_platform(location):
cp = cp.replace(':', ';')
-
+
if location == STAXServiceMachine:
cmd = '%s/bin/javac' % local_java_home
env = ['%s' % cp]
@@ -2040,7 +2040,7 @@
cmd = '%s/bin/javac' % JAVA_HOME
env = ['JAVA_HOME=%s' % JAVA_HOME, '%s' % cp]
</script>
-
+
<call function="'listFolderByExtension'" >
{
'location' : location ,
--
Gitblit v1.10.0