From 7c30dbb5403772b323df3ad907d9ed15d23b5aee Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Thu, 29 Apr 2010 20:35:40 +0000
Subject: [PATCH] Last batch of changes for this week. This adds support for the IETF based Password Policy for LDAP as SubEntry. Also resolves the following issues : - 4544 : initializeBackend() should not set JE env config params directly. - 4478 : ECL in draft compat mode / search lastchangenumber can be very long - 4538 : Virtual attributes not retrieved when entry cache configured - 4547 : Search Filter Matching differ for cn=Directory Manager and plain user. - 4514 : Logs shows unexpected message with replication monitoring data missing (Partial fix) - 4534 : Replication using security does not work after server restart - 4516 : SEVERE_ERROR: servers (...) have the same ServerId In addition, they also improve reliability and performance in various areas including CollectiveAttributes, Virtual Attributes and Subentries management, Schema loading, Replication...
---
opends/tests/staf-tests/shared/ant/tests.xml | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/opends/tests/staf-tests/shared/ant/tests.xml b/opends/tests/staf-tests/shared/ant/tests.xml
index a663dbf..27330d6 100644
--- a/opends/tests/staf-tests/shared/ant/tests.xml
+++ b/opends/tests/staf-tests/shared/ant/tests.xml
@@ -112,7 +112,7 @@
<property name="tests.request" value="EXECUTE FILE ${tests.xml} JOBNAME OpenDS_${tests.type} SCRIPTFILE ${tests.run.dir}/${tests.run.time}/config/${tests.config.file} WAIT CLEARLOGS"/>
<echo>While the tests are running you may tail the job logs at</echo>
- <echo>${staf.install.dir}/${staf.name}/logs/MACHINE/${host.name}</echo>
+ <echo>${staf.install.dir}/${staf.name}/data-${host.name}/service/log/MACHINE/${host.name}/GLOBAL</echo>
<echo>Running tests. This will take more than a while.</echo>
<property name="CLASSPATH" value="${staf.lib.dir}/JSTAF.jar:."/>
<exec
@@ -126,9 +126,9 @@
<env key="STAFCODEPAGE" value="LATIN_1"/>
</exec>
- <symlink link="${tests.run.dir}/latest" resource="${tests.run.time}" overwrite="true"/>
+ <symlink link="${tests.run.dir}/${remote.hostname}-latest" resource="${tests.run.time}" overwrite="true"/>
<echo>Report is available at</echo>
- <echo>${tests.run.dir}/latest</echo>
+ <echo>${tests.run.dir}/${remote.hostname}-latest</echo>
</target>
<target name="configure">
@@ -398,28 +398,35 @@
</target>
<target name="coverage-instrument" if="coverage.on">
<delete dir="${tests.tmp.dir}/coverage-instr" />
- <mkdir dir="${tests.tmp.dir}/coverage-instr" />
+ <mkdir dir="${tests.tmp.dir}/coverage-instr/opends" />
+ <mkdir dir="${tests.tmp.dir}/coverage-instr/dsml" />
<!-- unzip the original package in a temporary location to make the
changes necessary so that the coverage tool is called
-->
<unzip src="${opends.dir}/${opends.name}.zip"
- dest="${tests.tmp.dir}/coverage-instr"/>
+ dest="${tests.tmp.dir}/coverage-instr/opends"/>
+
+ <unzip src="${opends.dir}/${opends.name}-DSML.war"
+ dest="${tests.tmp.dir}/coverage-instr/dsml"/>
<!-- Add emma in the package along with the other librairies
this has the advantage of being automatically picked up by the scripts
-->
<copy file="${project.home}/ext/emma/lib/emma.jar"
- tofile="${tests.tmp.dir}/coverage-instr/${opends.name}/lib/emma.jar"/>
+ tofile="${tests.tmp.dir}/coverage-instr/opends/${opends.name}/lib/emma.jar"/>
+ <copy file="${project.home}/ext/emma/lib/emma.jar"
+ tofile="${tests.tmp.dir}/coverage-instr/dsml/WEB-INF/lib/emma.jar"/>
<!-- move the original product package to make room for the coverage
enabled package
-->
<move file="${opends.dir}/${opends.name}.zip" tofile="${opends.dir}/${opends.name}.zip.nocov"/>
+ <move file="${opends.dir}/${opends.name}-DSML.war" tofile="${opends.dir}/${opends.name}-DSML.war.nocov"/>
<!-- intrument the OpenDS java archive to gather coverage -->
- <java classpath="${tests.tmp.dir}/coverage-instr/${opends.name}/lib/emma.jar"
+ <java classpath="${tests.tmp.dir}/coverage-instr/opends/${opends.name}/lib/emma.jar"
classname="emma" fork="true">
- <jvmarg value="-Demma.metadata.out.file=${tests.tmp.dir}/coverage-instr/${opends.name}/coverage.em" />
+ <jvmarg value="-Demma.metadata.out.file=${tests.tmp.dir}/coverage-instr/opends/${opends.name}/coverage.em" />
<arg value="instr" />
<arg value="-m" />
<arg value="overwrite" />
@@ -432,20 +439,46 @@
<arg value="-ix" />
<arg value="com.*" />
<arg value="-ip" />
- <arg value="${tests.tmp.dir}/coverage-instr/${opends.name}/lib/OpenDS.jar:${tests.tmp.dir}/coverage-instr/${opends.name}/lib/extensions/snmp-mib2605.jar" />
+ <arg value="${tests.tmp.dir}/coverage-instr/opends/${opends.name}/lib/OpenDS.jar:${tests.tmp.dir}/coverage-instr/opends/${opends.name}/lib/extensions/snmp-mib2605.jar" />
</java>
- <!-- Repackage the product with coverage enabled scripts -->
- <zip basedir="${tests.tmp.dir}/coverage-instr" destfile="${opends.dir}/${opends.name}.zip">
- <zipfileset dir="${tests.tmp.dir}/coverage-instr"
+ <java classpath="${tests.tmp.dir}/coverage-instr/dsml/WEB-INF/lib/emma.jar"
+ classname="emma" fork="true">
+ <jvmarg value="-Demma.metadata.out.file=${tests.tmp.dir}/coverage-instr/dsml/WEB-INF/lib/coverage.em" />
+ <arg value="instr" />
+ <arg value="-m" />
+ <arg value="overwrite" />
+ <arg value="-ix" />
+ <arg value="-org.opends.guitools.*" />
+ <arg value="-ix" />
+ <arg value="-org.opends.quicksetup.*" />
+ <arg value="-ix" />
+ <arg value="org.*" />
+ <arg value="-ix" />
+ <arg value="com.*" />
+ <arg value="-ip" />
+ <arg value="${tests.tmp.dir}/coverage-instr/dsml/WEB-INF/classes" />
+ </java>
+ <!-- Repackage OpenDS the product with coverage enabled scripts -->
+ <zip basedir="${tests.tmp.dir}/coverage-instr/opends" destfile="${opends.dir}/${opends.name}.zip">
+ <zipfileset dir="${tests.tmp.dir}/coverage-instr/opends"
includes="${opends.name}/setup,${opends.name}/uninstall,${opends.name}/upgrade,${opends.name}/bin/*,${opends.name}/lib/*.sh"
filemode="755" dirmode="755" />
</zip>
+
+ <!-- Repackage DSML Gateway the product with coverage enabled scripts -->
+ <zip basedir="${tests.tmp.dir}/coverage-instr/dsml" destfile="${opends.dir}/${opends.name}-DSML.war">
+ <zipfileset dir="${tests.tmp.dir}/coverage-instr/dsml"
+ includes="WEB-INF/**,META-INF/**"/>
+ </zip>
+
<!-- <delete dir="${tests.tmp.dir}/coverage-instr"/> -->
</target>
<target name="restore-pkg" if="coverage.on">
<delete file="${opends.dir}/${opends.name}.zip"/>
<move file="${opends.dir}/${opends.name}.zip.nocov" tofile="${opends.dir}/${opends.name}.zip"/>
+ <delete file="${opends.dir}/${opends.name}-DSML.war"/>
+ <move file="${opends.dir}/${opends.name}-DSML.war.nocov" tofile="${opends.dir}/${opends.name}-DSML.war"/>
</target>
<target name="testwithcoverage" depends="coverage-on,coverage-instrument,run,restore-pkg"/>
--
Gitblit v1.10.0