From 4e7101fd2097719f302d0948d855f23fff6059f8 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Mon, 26 Oct 2009 15:18:37 +0000
Subject: [PATCH] Frontport of 2.2 tests to the trunk
---
opends/tests/staf-tests/functional-tests/testcases/setup/security.xml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml b/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml
index 19c3d59..4b15cbf 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/setup/security.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008 Sun Microsystems, Inc.
+ ! Copyright 2008-2009 Sun Microsystems, Inc.
! -->
<stax>
@@ -52,7 +52,7 @@
<call function="'testSuite_Preamble'"/>
-
+
<call function="'getFreePort'">
{
'host' : STAF_REMOTE_HOSTNAME,
@@ -76,7 +76,7 @@
}
</call>
<script>SEC_I1_ADMIN_PORT = STAXResult</script>
-
+
<call function="'getFreePort'">
{
'host' : STAF_REMOTE_HOSTNAME,
@@ -108,7 +108,7 @@
}
</call>
<script>SEC_I2_ADMIN_PORT = STAXResult</script>
-
+
<call function="'getFreePort'">
{
'host' : STAF_REMOTE_HOSTNAME,
@@ -155,7 +155,11 @@
DM_PW = 'secret12'
DM_PW_FILE = '%s/setup/pwd-security.ldif' % remote.data
- KEYTOOL = '%s/bin/keytool' % (JAVA_HOME)
+ if is_windows_platform(STAF_REMOTE_HOSTNAME):
+ KEYTOOL = '%s/bin/keytool.exe' % (JAVA_HOME)
+ else:
+ KEYTOOL = '%s/bin/keytool' % (JAVA_HOME)
+
SEC_I1_BASE = '%s/sec_i1' % (OUT_GROUP)
SEC_I1_ROOT = '%s/%s' % (SEC_I1_BASE, OPENDSNAME)
SEC_I2_BASE = '%s/sec_i2' % (OUT_GROUP)
--
Gitblit v1.10.0