From: <di...@us...> - 2006-12-27 18:02:27
|
Revision: 5083 http://svn.sourceforge.net/exist/?rev=5083&view=rev Author: dizzzz Date: 2006-12-27 10:02:24 -0800 (Wed, 27 Dec 2006) Log Message: ----------- Fix for benchmark suite. Suite can be run now from commandline. Added antlib.xml files. Wolf please review? Perig you can continue...... Modified Paths: -------------- trunk/eXist/build/scripts/performance.xml trunk/eXist/build.xml Property Changed: ---------------- trunk/eXist/test/ Modified: trunk/eXist/build/scripts/performance.xml =================================================================== --- trunk/eXist/build/scripts/performance.xml 2006-12-27 15:33:41 UTC (rev 5082) +++ trunk/eXist/build/scripts/performance.xml 2006-12-27 18:02:24 UTC (rev 5083) @@ -4,36 +4,45 @@ <!-- eXist build file : Run jUnit tests --> <!-- ======================================================================= --> <project basedir="../.." default="benchmark" name="performance tests"> - + <description>Performance tests for eXist</description> - - <typedef resource="org/exist/performance/ant/antlib.xml" uri="http://exist-db.org/test"> - <classpath refid="classpath.junit"/> - <classpath refid="classpath.core"/> - </typedef> - - <typedef resource="org/exist/ant/antlib.xml" uri="http://exist-db.org/ant"> - <classpath refid="classpath.core"/> - </typedef> - + <property name="benchmark.output" value="${junit.reports}/benchmark"/> <property name="benchmark.src" value="${junit.reports}/src"/> - - <target name="benchmark" depends="run-benchmark, post-process-benchmark"/> - + + <!-- Don't forget build clean all before calling this target --> + <target name="benchmark" depends="prepare-benchmark,run-benchmark, post-process-benchmark"/> + + <target name="prepare-benchmark" > + <copy todir="${junit.reports}/classes"> + <fileset dir="${junit.reports}/src"> + <include name="**/antlib.xml"/> + </fileset> + </copy> + </target> + <target name="run-benchmark" xmlns:test="http://exist-db.org/test"> + <typedef resource="org/exist/performance/ant/antlib.xml" uri="http://exist-db.org/test"> + <classpath refid="classpath.core"/> + <classpath refid="classpath.junit"/> + </typedef> + <mkdir dir="${benchmark.output}"/> <test:benchmark outputFile="${benchmark.output}/results.xml" - source="${benchmark.src}/org/exist/performance/test.xml"/> + source="${benchmark.src}/org/exist/performance/test.xml"/> </target> - + <target name="post-process-benchmark" xmlns:xdb="http://exist-db.org/ant"> + <typedef resource="org/exist/ant/antlib.xml" uri="http://exist-db.org/ant"> + <classpath refid="classpath.core"/> + </typedef> + <xdb:store uri="xmldb:exist:///db/bench" createcollection="true" initdb="true"> - <fileset dir="${benchmark.output}" includes="results.xml"/> - </xdb:store> + <fileset dir="${benchmark.output}" includes="results.xml"/> + </xdb:store> <xdb:xquery uri="xmldb:exist:///db/bench" - queryFile="${benchmark.src}/org/exist/performance/log2html.xql" - outputProperty="benchmark.result"/> + queryFile="${benchmark.src}/org/exist/performance/log2html.xql" + outputProperty="benchmark.result"/> <echo file="${benchmark.output}/results.html" message="${benchmark.result}"/> <copy todir="${benchmark.output}" file="${benchmark.src}/org/exist/performance/style.css"/> </target> Modified: trunk/eXist/build.xml =================================================================== --- trunk/eXist/build.xml 2006-12-27 15:33:41 UTC (rev 5082) +++ trunk/eXist/build.xml 2006-12-27 18:02:24 UTC (rev 5083) @@ -37,7 +37,7 @@ <!-- Additional scripts --> <import file="build/scripts/junit.xml" /> - <!--import file="build/scripts/performance.xml" /--> + <import file="build/scripts/performance.xml" /> <import file="build/scripts/quality.xml" /> <import file="build/scripts/demoserver.xml" /> <import file="build/scripts/subversion.xml" /> Property changes on: trunk/eXist/test ___________________________________________________________________ Name: svn:ignore - classes junit + classes junit benchmark This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |