From 3f68fce3d2339147c0009711682e9929831bf91b Mon Sep 17 00:00:00 2001
From: al_xipe <al_xipe@localhost>
Date: Fri, 16 Feb 2007 00:50:08 +0000
Subject: [PATCH] this commit includes: 1. explicitly define where to find the jvm for stax and staxevent services 2. fix typo in a message 3. fix to restore original config.py in the workspace 4. fix for windows agnostism of runFuncTests.xml
---
opendj-sdk/opends/tests/functional-tests/staf-installer.xml | 8 +++++---
opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml | 4 ++--
opendj-sdk/opends/tests/functional-tests/staf-installer/functional-tests.cfg | 9 +++++++--
3 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/staf-installer.xml b/opendj-sdk/opends/tests/functional-tests/staf-installer.xml
index 7bff9c4..0cc4f77 100644
--- a/opendj-sdk/opends/tests/functional-tests/staf-installer.xml
+++ b/opendj-sdk/opends/tests/functional-tests/staf-installer.xml
@@ -339,7 +339,7 @@
<expandproperties/>
</filterchain>
</copy>
- <echo>Running tests. This will more than a while.</echo>
+ <echo>Running tests. This will take more than a while.</echo>
<!-- <staf location="LOCAL"
service="service"
request="list services"
@@ -372,11 +372,13 @@
</copy>
<delete dir="${staf.home}/logs" />
<echo>Saving report</echo>
- <copy todir="${tests.run.dir}/${tests.run.time}/report">
+ <move todir="${tests.run.dir}/${tests.run.time}/report">
<fileset dir="${staf.tmp.dir}">
<include name="r*"/>
</fileset>
- </copy>
+ </move>
+ <delete dir="${staf.tmp.dir}/${product.name}"/>
+ <delete file="${staf.tmp.dir}/${product.name}.zip"/>
</target>
<target name="run-daily" depends="status-do,download-daily">
diff --git a/opendj-sdk/opends/tests/functional-tests/staf-installer/functional-tests.cfg b/opendj-sdk/opends/tests/functional-tests/staf-installer/functional-tests.cfg
index bd53f5a..cabfc2c 100644
--- a/opendj-sdk/opends/tests/functional-tests/staf-installer/functional-tests.cfg
+++ b/opendj-sdk/opends/tests/functional-tests/staf-installer/functional-tests.cfg
@@ -9,8 +9,13 @@
# Default Service Loader Service
serviceloader library STAFDSLS
-SERVICE STAX LIBRARY JSTAF EXECUTE {STAF/Config/STAFRoot}/services/stax/STAX.jar OPTION J2=-Xmx384m
-SERVICE EVENT LIBRARY JSTAF EXECUTE {STAF/Config/STAFRoot}/services/stax/STAFEvent.jar
+SERVICE STAX LIBRARY JSTAF EXECUTE {STAF/Config/STAFRoot}/services/stax/STAX.jar \
+ OPTION JVMName=JVMSTAX \
+ OPTION JVM=${java.home}${file.separator}bin${file.separator}java \
+ OPTION J2=-Xmx384m
+SERVICE EVENT LIBRARY JSTAF EXECUTE {STAF/Config/STAFRoot}/services/stax/STAFEvent.jar \
+ OPTION JVMName=JVMSTAXEVENT \
+ OPTION JVM=${java.home}${file.separator}bin${file.separator}java
SET MAXQUEUESIZE 10000
trust level 5 machine tcp://localhost
service log library STAFLog parms "Directory {STAF/Config/STAFRoot}/../logs ResolveMessage"
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml b/opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml
index 944f4fc..27aed7a 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/runFuncTests.xml
@@ -62,8 +62,8 @@
DSTFILE = '%s/%s' % (TMPDIR,ZIPNAME)
OPENDS_BINPATH = '%s/%s/bin' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
OSName= STAXResult
- winPattern=re.compile('win*', re.IGNORECASE)
- isWindows=winPattern.match(OSName)
+ winPattern=re.compile('win', re.IGNORECASE)
+ isWindows=winPattern.search(OSName)
if isWindows:
fileExt='.bat'
else:
--
Gitblit v1.10.0