From 4044df9524cc5cb9355abb790006698c47cc5baf Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Tue, 14 Nov 2006 16:52:43 +0000
Subject: [PATCH] functional tests - align functional tests with tool changes
---
opendj-sdk/opends/tests/functional-tests/testcases/schema/schema.xml | 30 ----
opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml | 4
opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml | 39 -----
opendj-sdk/opends/tests/functional-tests/testcases/core/core_version_report.xml | 30 ----
opendj-sdk/opends/tests/functional-tests/testcases/core/core_entry_cache.xml | 30 ----
opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml | 30 ----
opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml | 18 +-
opendj-sdk/opends/tests/functional-tests/shared/functions/ldap.xml | 24 +-
opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml | 30 ----
opendj-sdk/opends/tests/functional-tests/shared/functions/utils.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml | 30 ----
opendj-sdk/opends/tests/functional-tests/testcases/core/core_tf_filters.xml | 30 ----
opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml | 30 ----
opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_setup.xml | 30 ----
opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml | 30 ----
15 files changed, 24 insertions(+), 363 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml b/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml
index ab84d9a..17847cb 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/functions/dsadm.xml
@@ -48,7 +48,7 @@
<process name="'Configure DS'">
<location>'%s' % (STAF_REMOTE_HOSTNAME) </location>
- <command>'%s/configure-ds.%s' % (OPENDS_BINPATH,fileExt)</command>
+ <command>'%s/configure-ds%s' % (OPENDS_BINPATH,fileExt)</command>
<parms>'-p %s -b "%s"' % (dsInstancePort,dsInstanceSuffix)</parms>
<workdir>'%s' % (OPENDS_BINPATH)</workdir>
<envs>
@@ -84,7 +84,7 @@
<process name="'Start DS'">
<location>'%s' % (STAF_REMOTE_HOSTNAME) </location>
- <command>'%s/start-ds.%s' % (dsbinpath,fileExt)</command>
+ <command>'%s/start-ds%s' % (dsbinpath,fileExt)</command>
<workdir>'%s' % (dsbinpath)</workdir>
<envs>
['PATH=/bin:/usr/bin:%s' % (dsbinpath), 'JAVA_HOME=%s' % (JAVA_HOME)]
@@ -120,7 +120,7 @@
<process name="'Stop DS'">
<location>'%s' % (STAF_REMOTE_HOSTNAME) </location>
- <command>'%s/stop-ds.%s' % (OPENDS_BINPATH,fileExt)</command>
+ <command>'%s/stop-ds%s' % (OPENDS_BINPATH,fileExt)</command>
<parms>'-p %s' % (dsInstancePort)</parms>
<workdir>'%s' % (OPENDS_BINPATH)</workdir>
<envs>
@@ -277,11 +277,11 @@
<sequence>
<message>
- 'import-ldif.%s -l %s -n %s %s' % (fileExt,ldifFile,backEnd,extraParams)
+ 'import-ldif%s -l %s -n %s %s' % (fileExt,ldifFile,backEnd,extraParams)
</message>
<process name="'Offline Import'">
<location>'%s' % (STAF_REMOTE_HOSTNAME) </location>
- <command>'%s/import-ldif.%s' % (OPENDS_BINPATH,fileExt)</command>
+ <command>'%s/import-ldif%s' % (OPENDS_BINPATH,fileExt)</command>
<parms>'-l %s -n %s %s' % (ldifFile,backEnd,extraParams)</parms>
<workdir>'%s' % (OPENDS_BINPATH)</workdir>
<envs>
@@ -500,11 +500,11 @@
<!-- On line Import Task with ldapmodify -->
<message>
- 'ldapmodify.%s -a -h %s -p %s -D "%s" -w %s' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd)
+ 'ldapmodify%s -a -h %s -p %s -D "%s" -w %s' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd)
</message>
<process name="'On line Import Task'">
<location>'%s' % (STAF_REMOTE_HOSTNAME) </location>
- <command>'%s/ldapmodify.%s' % (OPENDS_BINPATH,fileExt)</command>
+ <command>'%s/ldapmodify%s' % (OPENDS_BINPATH,fileExt)</command>
<parms>'-a -h %s -p %s -D "%s" -w %s' % (dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd)</parms>
<workdir>'%s' % (OPENDS_BINPATH)</workdir>
<envs>
@@ -541,11 +541,11 @@
<sequence>
<message>
- 'ldapsearch.%s -h %s -p %s -D "%s" -w %s -s base -b "%s" "objectclass=*" ds-task-state' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,taskDN)
+ 'ldapsearch%s -h %s -p %s -D "%s" -w %s -s base -b "%s" "objectclass=*" ds-task-state' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,taskDN)
</message>
<process name="'Search On line Import Task'">
<location>'%s' % (STAF_REMOTE_HOSTNAME) </location>
- <command>'%s/ldapsearch.%s' % (OPENDS_BINPATH,fileExt)</command>
+ <command>'%s/ldapsearch%s' % (OPENDS_BINPATH,fileExt)</command>
<parms>'-h %s -p %s -D "%s" -w %s -s base -b "%s" "objectclass=*" ds-task-state' % (dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,taskDN)</parms>
<workdir>'%s' % (OPENDS_BINPATH)</workdir>
<envs>
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/functions/ldap.xml b/opendj-sdk/opends/tests/functional-tests/shared/functions/ldap.xml
index fdc3b63..dc9299e 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/functions/ldap.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/functions/ldap.xml
@@ -58,11 +58,11 @@
<sequence>
<message>
- 'ldapmodify.%s -a -h %s -p %s -D "%s" -w %s %s -f "%s"' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,entryToBeAdded)
+ 'ldapmodify%s -a -h %s -p %s -D "%s" -w %s %s -f "%s"' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,entryToBeAdded)
</message>
<process name="'Add Entry'">
<location>'%s' % (STAF_REMOTE_HOSTNAME) </location>
- <command>'%s/ldapmodify.%s' % (OPENDS_BINPATH,fileExt)</command>
+ <command>'%s/ldapmodify%s' % (OPENDS_BINPATH,fileExt)</command>
<parms>'-a -h %s -p %s -D "%s" -w %s %s -f "%s"' % (dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,entryToBeAdded)</parms>
<workdir>'%s' % (OPENDS_BINPATH)</workdir>
<envs>
@@ -111,11 +111,11 @@
<sequence>
<message>
- 'ldapmodify.%s -h %s -p %s -D "%s" -w %s %s -f "%s"' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,entryToBeModified)
+ 'ldapmodify%s -h %s -p %s -D "%s" -w %s %s -f "%s"' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,entryToBeModified)
</message>
<process name="'Modify Entry'">
<location>'%s' % (STAF_REMOTE_HOSTNAME) </location>
- <command>'%s/ldapmodify.%s' % (OPENDS_BINPATH,fileExt)</command>
+ <command>'%s/ldapmodify%s' % (OPENDS_BINPATH,fileExt)</command>
<parms>'-h %s -p %s -D "%s" -w %s %s -f "%s"' % (dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,entryToBeModified)</parms>
<workdir>'%s' % (OPENDS_BINPATH)</workdir>
<envs>
@@ -167,11 +167,11 @@
<sequence>
<message>
- 'ldapsearch.%s -h %s -p %s -D "%s" -w %s %s -b "%s" "%s"' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,dsBaseDN,dsFilter)
+ 'ldapsearch%s -h %s -p %s -D "%s" -w %s %s -b "%s" "%s"' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,dsBaseDN,dsFilter)
</message>
<process name="'Search Base Object'">
<location>'%s' % (STAF_REMOTE_HOSTNAME) </location>
- <command>'%s/ldapsearch.%s' % (OPENDS_BINPATH,fileExt)</command>
+ <command>'%s/ldapsearch%s' % (OPENDS_BINPATH,fileExt)</command>
<parms>'-h %s -p %s -D "%s" -w %s %s -b "%s" "%s"' % (dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,dsBaseDN,dsFilter)</parms>
<workdir>'%s' % (OPENDS_BINPATH)</workdir>
<envs>
@@ -212,11 +212,11 @@
<sequence>
<message>
- 'ldapsearch.%s -h %s -p %s %s -b "%s" "%s"' % (fileExt,dsInstanceHost,dsInstancePort,extraParams,dsBaseDN,dsFilter)
+ 'ldapsearch%s -h %s -p %s %s -b "%s" "%s"' % (fileExt,dsInstanceHost,dsInstancePort,extraParams,dsBaseDN,dsFilter)
</message>
<process name="'Anonymous Search Base Object'">
<location>'%s' % (STAF_REMOTE_HOSTNAME) </location>
- <command>'%s/ldapsearch.%s' % (OPENDS_BINPATH,fileExt)</command>
+ <command>'%s/ldapsearch%s' % (OPENDS_BINPATH,fileExt)</command>
<parms>'-h %s -p %s %s -b "%s" "%s"' % (dsInstanceHost,dsInstancePort,extraParams,dsBaseDN,dsFilter)</parms>
<workdir>'%s' % (OPENDS_BINPATH)</workdir>
<envs>
@@ -260,11 +260,11 @@
<sequence>
<message>
- 'ldapdelete.%s -h %s -p %s -D "%s" -w %s %s "%s"' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,dsBaseDN)
+ 'ldapdelete%s -h %s -p %s -D "%s" -w %s %s "%s"' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,dsBaseDN)
</message>
<process name="'Delete Object'">
<location>'%s' % (STAF_REMOTE_HOSTNAME) </location>
- <command>'%s/ldapdelete.%s' % (OPENDS_BINPATH,fileExt)</command>
+ <command>'%s/ldapdelete%s' % (OPENDS_BINPATH,fileExt)</command>
<parms>'-h %s -p %s -D "%s" -w %s %s "%s"' % (dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,dsBaseDN)</parms>
<workdir>'%s' % (OPENDS_BINPATH)</workdir>
<envs>
@@ -316,11 +316,11 @@
<sequence>
<message>
- 'ldapcompare.%s -h %s -p %s -D "%s" -w %s %s "%s" "%s"' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,attrToBeCompared,entryToBeCompared)
+ 'ldapcompare%s -h %s -p %s -D "%s" -w %s %s "%s" "%s"' % (fileExt,dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,attrToBeCompared,entryToBeCompared)
</message>
<process name="'Compare Entry'">
<location>'%s' % (STAF_REMOTE_HOSTNAME) </location>
- <command>'%s/ldapcompare.%s' % (OPENDS_BINPATH,fileExt)</command>
+ <command>'%s/ldapcompare%s' % (OPENDS_BINPATH,fileExt)</command>
<parms>'-h %s -p %s -D "%s" -w %s %s "%s" "%s"' % (dsInstanceHost,dsInstancePort,dsInstanceDn,dsInstancePswd,extraParams,attrToBeCompared,entryToBeCompared)</parms>
<workdir>'%s' % (OPENDS_BINPATH)</workdir>
<envs>
diff --git a/opendj-sdk/opends/tests/functional-tests/shared/functions/utils.xml b/opendj-sdk/opends/tests/functional-tests/shared/functions/utils.xml
index dcc8e2c..39f14ed 100755
--- a/opendj-sdk/opends/tests/functional-tests/shared/functions/utils.xml
+++ b/opendj-sdk/opends/tests/functional-tests/shared/functions/utils.xml
@@ -31,7 +31,7 @@
<function name="checkRC">
<function-prolog>
- This function checks the STAF return code against an expected return code
+ This function checks a return code against an expected return code
</function-prolog>
<function-map-args>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml
index 8c44d3a..f972e00 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml
@@ -34,36 +34,6 @@
<sequence>
- <script>
- STAXLogMessage = 1
- SRCFILE = '%s/%s' % (ZIPPATH,ZIPNAME)
- DSTFILE = '%s/%s' % (TMPDIR,ZIPNAME)
- OPENDS_BINPATH = '%s/%s/bin' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
- </script>
-
- <!--- Import all the shared libraries
- may be we should have a loadlibs.xml to
- load all the libs -->
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/utils.xml' % (TESTS_FUNCTIONS_DIR)"/>
-
- <!--- Set OS related variables on remote host -->
- <message>
- 'Set OS related variables on remote host.'
- </message>
- <call function="'setOSvariables'">
- { 'hostname' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <script>OSName= STAXResult</script>
-
- <if expr="OSName == 'Win2003'">
- <script>fileExt= 'bat'</script>
- <else>
- <script>fileExt= 'sh'</script>
- </else>
- </if>
-
<parallel>
<block name="'Block DS Process Active'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_entry_cache.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_entry_cache.xml
index 7769cc6..0087666 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_entry_cache.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_entry_cache.xml
@@ -34,36 +34,6 @@
<sequence>
- <script>
- STAXLogMessage = 1
- SRCFILE = '%s/%s' % (ZIPPATH,ZIPNAME)
- DSTFILE = '%s/%s' % (TMPDIR,ZIPNAME)
- OPENDS_BINPATH = '%s/%s/bin' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
- </script>
-
- <!--- Import all the shared libraries
- may be we should have a loadlibs.xml to
- load all the libs -->
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/utils.xml' % (TESTS_FUNCTIONS_DIR)"/>
-
- <!--- Set OS related variables on remote host -->
- <message>
- 'Set OS related variables on remote host.'
- </message>
- <call function="'setOSvariables'">
- { 'hostname' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <script>OSName= STAXResult</script>
-
- <if expr="OSName == 'Win2003'">
- <script>fileExt= 'bat'</script>
- <else>
- <script>fileExt= 'sh'</script>
- </else>
- </if>
-
<!--- Check that DS started -->
<call function="'isAlive'">
{ 'noOfLoops' : 5 ,
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
index 684191c..2c196cd 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_sizelimit.xml
@@ -34,36 +34,6 @@
<sequence>
- <script>
- STAXLogMessage = 1
- SRCFILE = '%s/%s' % (ZIPPATH,ZIPNAME)
- DSTFILE = '%s/%s' % (TMPDIR,ZIPNAME)
- OPENDS_BINPATH = '%s/%s/bin' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
- </script>
-
- <!--- Import all the shared libraries
- may be we should have a loadlibs.xml to
- load all the libs -->
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/utils.xml' % (TESTS_FUNCTIONS_DIR)"/>
-
- <!--- Set OS related variables on remote host -->
- <message>
- 'Set OS related variables on remote host.'
- </message>
- <call function="'setOSvariables'">
- { 'hostname' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <script>OSName= STAXResult</script>
-
- <if expr="OSName == 'Win2003'">
- <script>fileExt= 'bat'</script>
- <else>
- <script>fileExt= 'sh'</script>
- </else>
- </if>
-
<!--- Check that DS started -->
<call function="'isAlive'">
{ 'noOfLoops' : 5 ,
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
index 9537cc5..c27c152 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_search_timelimit.xml
@@ -34,36 +34,6 @@
<sequence>
- <script>
- STAXLogMessage = 1
- SRCFILE = '%s/%s' % (ZIPPATH,ZIPNAME)
- DSTFILE = '%s/%s' % (TMPDIR,ZIPNAME)
- OPENDS_BINPATH = '%s/%s/bin' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
- </script>
-
- <!--- Import all the shared libraries
- may be we should have a loadlibs.xml to
- load all the libs -->
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/utils.xml' % (TESTS_FUNCTIONS_DIR)"/>
-
- <!--- Set OS related variables on remote host -->
- <message>
- 'Set OS related variables on remote host.'
- </message>
- <call function="'setOSvariables'">
- { 'hostname' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <script>OSName= STAXResult</script>
-
- <if expr="OSName == 'Win2003'">
- <script>fileExt= 'bat'</script>
- <else>
- <script>fileExt= 'sh'</script>
- </else>
- </if>
-
<!--- Check that DS started -->
<call function="'isAlive'">
{ 'noOfLoops' : 5 ,
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml
index 9c3918b..ee86b32 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_setup.xml
@@ -34,36 +34,6 @@
<sequence>
- <script>
- STAXLogMessage = 1
- SRCFILE = '%s/%s' % (ZIPPATH,ZIPNAME)
- DSTFILE = '%s/%s' % (TMPDIR,ZIPNAME)
- OPENDS_BINPATH = '%s/%s/bin' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
- </script>
-
- <!--- Import all the shared libraries
- may be we should have a loadlibs.xml to
- load all the libs -->
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/utils.xml' % (TESTS_FUNCTIONS_DIR)"/>
-
- <!--- Set OS related variables on remote host -->
- <message>
- 'Set OS related variables on remote host.'
- </message>
- <call function="'setOSvariables'">
- { 'hostname' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <script>OSName= STAXResult</script>
-
- <if expr="OSName == 'Win2003'">
- <script>fileExt= 'bat'</script>
- <else>
- <script>fileExt= 'sh'</script>
- </else>
- </if>
-
<!--- Check that DS started -->
<call function="'isAlive'">
{ 'noOfLoops' : 5 ,
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_tf_filters.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_tf_filters.xml
index 6c2f59f..4e22c69 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_tf_filters.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_tf_filters.xml
@@ -34,36 +34,6 @@
<sequence>
- <script>
- STAXLogMessage = 1
- SRCFILE = '%s/%s' % (ZIPPATH,ZIPNAME)
- DSTFILE = '%s/%s' % (TMPDIR,ZIPNAME)
- OPENDS_BINPATH = '%s/%s/bin' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
- </script>
-
- <!--- Import all the shared libraries
- may be we should have a loadlibs.xml to
- load all the libs -->
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/utils.xml' % (TESTS_FUNCTIONS_DIR)"/>
-
- <!--- Set OS related variables on remote host -->
- <message>
- 'Set OS related variables on remote host.'
- </message>
- <call function="'setOSvariables'">
- { 'hostname' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <script>OSName= STAXResult</script>
-
- <if expr="OSName == 'Win2003'">
- <script>fileExt= 'bat'</script>
- <else>
- <script>fileExt= 'sh'</script>
- </else>
- </if>
-
<!--- Check that DS started -->
<call function="'isAlive'">
{ 'noOfLoops' : 5 ,
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_version_report.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_version_report.xml
index a70edad..f7b3bcb 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core_version_report.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core_version_report.xml
@@ -34,36 +34,6 @@
<sequence>
- <script>
- STAXLogMessage = 1
- SRCFILE = '%s/%s' % (ZIPPATH,ZIPNAME)
- DSTFILE = '%s/%s' % (TMPDIR,ZIPNAME)
- OPENDS_BINPATH = '%s/%s/bin' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
- </script>
-
- <!--- Import all the shared libraries
- may be we should have a loadlibs.xml to
- load all the libs -->
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/utils.xml' % (TESTS_FUNCTIONS_DIR)"/>
-
- <!--- Set OS related variables on remote host -->
- <message>
- 'Set OS related variables on remote host.'
- </message>
- <call function="'setOSvariables'">
- { 'hostname' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <script>OSName= STAXResult</script>
-
- <if expr="OSName == 'Win2003'">
- <script>fileExt= 'bat'</script>
- <else>
- <script>fileExt= 'sh'</script>
- </else>
- </if>
-
<!--- Check that DS started -->
<call function="'isAlive'">
{ 'noOfLoops' : 5 ,
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml b/opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml
index a986b74..c609e0a 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml
@@ -34,45 +34,6 @@
<sequence>
- <script>
- STAXLogMessage = 1
- SRCFILE = '%s/%s' % (ZIPPATH,ZIPNAME)
- DSTFILE = '%s/%s' % (TMPDIR,ZIPNAME)
- OPENDS_BINPATH = '%s/%s/bin' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
- </script>
-
- <!--- Import all the shared libraries
- may be we should have a loadlibs.xml to
- load all the libs -->
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/utils.xml' % (TESTS_FUNCTIONS_DIR)"/>
-
- <!--- Set OS related variables on remote host -->
- <message>
- 'Set OS related variables on remote host.'
- </message>
- <call function="'setOSvariables'">
- { 'hostname' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <script>OSName= STAXResult</script>
-
- <if expr="OSName == 'Win2003'">
- <script>fileExt= 'bat'</script>
- <else>
- <script>fileExt= 'sh'</script>
- </else>
- </if>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/stafcmd.xml' % (TESTS_FUNCTIONS_DIR)"/>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/dsadm.xml' % (TESTS_FUNCTIONS_DIR)"/>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/ldap.xml' % (TESTS_FUNCTIONS_DIR)"/>
-
<parallel>
<block name="'Block DS Process Active'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml b/opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml
index c5d9a7f..ed5f025 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml
@@ -65,9 +65,9 @@
</script>
<if expr="OSName == 'Win2003'">
- <script>fileExt= 'bat'</script>
+ <script>fileExt= '.bat'</script>
<else>
- <script>fileExt= 'sh'</script>
+ <script>fileExt= ''</script>
</else>
</if>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema.xml b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema.xml
index 16c1bbb..0d5da3d 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema.xml
@@ -34,36 +34,6 @@
<sequence>
- <script>
- STAXLogMessage = 1
- SRCFILE = '%s/%s' % (ZIPPATH,ZIPNAME)
- DSTFILE = '%s/%s' % (TMPDIR,ZIPNAME)
- OPENDS_BINPATH = '%s/%s/bin' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
- </script>
-
- <!--- Import all the shared libraries
- may be we should have a loadlibs.xml to
- load all the libs -->
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/utils.xml' % (TESTS_FUNCTIONS_DIR)"/>
-
- <!--- Set OS related variables on remote host -->
- <message>
- 'Set OS related variables on remote host.'
- </message>
- <call function="'setOSvariables'">
- { 'hostname' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <script>OSName= STAXResult</script>
-
- <if expr="OSName == 'Win2003'">
- <script>fileExt= 'bat'</script>
- <else>
- <script>fileExt= 'sh'</script>
- </else>
- </if>
-
<parallel>
<block name="'Block DS Process Active'">
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml
index 595409c..e183bf3 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_rfc_tests.xml
@@ -34,36 +34,6 @@
<sequence>
- <script>
- STAXLogMessage = 1
- SRCFILE = '%s/%s' % (ZIPPATH,ZIPNAME)
- DSTFILE = '%s/%s' % (TMPDIR,ZIPNAME)
- OPENDS_BINPATH = '%s/%s/bin' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
- </script>
-
- <!--- Import all the shared libraries
- may be we should have a loadlibs.xml to
- load all the libs -->
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/utils.xml' % (TESTS_FUNCTIONS_DIR)"/>
-
- <!--- Set OS related variables on remote host -->
- <message>
- 'Set OS related variables on remote host.'
- </message>
- <call function="'setOSvariables'">
- { 'hostname' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <script>OSName= STAXResult</script>
-
- <if expr="OSName == 'Win2003'">
- <script>fileExt= 'bat'</script>
- <else>
- <script>fileExt= 'sh'</script>
- </else>
- </if>
-
<!--- Check that DS started -->
<call function="'isAlive'">
{ 'noOfLoops' : 5 ,
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_setup.xml b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_setup.xml
index 4be58bb..4b5c8fa 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_setup.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_setup.xml
@@ -34,36 +34,6 @@
<sequence>
- <script>
- STAXLogMessage = 1
- SRCFILE = '%s/%s' % (ZIPPATH,ZIPNAME)
- DSTFILE = '%s/%s' % (TMPDIR,ZIPNAME)
- OPENDS_BINPATH = '%s/%s/bin' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
- </script>
-
- <!--- Import all the shared libraries
- may be we should have a loadlibs.xml to
- load all the libs -->
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/utils.xml' % (TESTS_FUNCTIONS_DIR)"/>
-
- <!--- Set OS related variables on remote host -->
- <message>
- 'Set OS related variables on remote host.'
- </message>
- <call function="'setOSvariables'">
- { 'hostname' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <script>OSName= STAXResult</script>
-
- <if expr="OSName == 'Win2003'">
- <script>fileExt= 'bat'</script>
- <else>
- <script>fileExt= 'sh'</script>
- </else>
- </if>
-
<!--- Check that DS started -->
<call function="'isAlive'">
{ 'noOfLoops' : 5 ,
--
Gitblit v1.10.0