cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r171101 - in /cocoon/branches/BRANCH_2_1_X: build.properties tools/src/blocks-build.xsl tools/targets/test-build.xml
Date Fri, 20 May 2005 11:23:57 GMT
Author: bdelacretaz
Date: Fri May 20 04:23:56 2005
New Revision: 171101

URL: http://svn.apache.org/viewcvs?rev=171101&view=rev
Log:
htmlunit-tests can be configured in build.properties to run a subset of tests only

Modified:
    cocoon/branches/BRANCH_2_1_X/build.properties
    cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl
    cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml

Modified: cocoon/branches/BRANCH_2_1_X/build.properties
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/build.properties?rev=171101&r1=171100&r2=171101&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/build.properties (original)
+++ cocoon/branches/BRANCH_2_1_X/build.properties Fri May 20 04:23:56 2005
@@ -75,6 +75,10 @@
 # for serious leak testing increase iteration count to 10000
 htmlunit.test.Bug26186InternalRequestMemoryLeak.iterations=1
 
+# This can be changed to run only a subset of the tests
+# The mask is used in ant <fileset>/<include> elements
+htmlunit.test.include=**/*TestCase.class
+
 # ---- JUnit -------------------------------------------------------------------
 
 junit.test.debugport=8000

Modified: cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl?rev=171101&r1=171100&r2=171101&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/src/blocks-build.xsl Fri May 20 04:23:56 2005
@@ -21,7 +21,7 @@
 
   <xsl:template match="/">
     <project default="compile" basedir="." name="blocks">
-      <description>Autogenerated Ant build file that builds blocks.</description>
+      <description>Ant build file that builds blocks, autogenerated from blocks-build.xsl.</description>
 
       <path id="classpath">
         <fileset dir="${{lib.core}}">
@@ -461,8 +461,9 @@
                 <formatter type="xml"/>
                 <batchtest todir="${{build.test.htmlunit.output}}">
                   <fileset dir="${{build.blocks}}/@{{name}}/test/htmlunit">
-                    <include name="**/*TestCase.class"/>
-                    <include name="**/*Test.class"/>
+                    <include name="${htmlunit.test.include}"/>
+                    <!-- BD: there was also <include name="**/*Test.class"/> but
let's use the
+                    same configurable include clause as in test-build.xml -->
                     <exclude name="**/AllTest.class"/>
                     <exclude name="**/*$$*Test.class"/>
                     <exclude name="**/Abstract*.class"/>

Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml?rev=171101&r1=171100&r2=171101&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml Fri May 20 04:23:56 2005
@@ -98,6 +98,7 @@
       verbose="false"
       usetimestamp="false"/>
 
+    <echo>To run a selected subset of the tests, use 'htmlunit.test.include' in build.properties
(currently set to ${htmlunit.test.include})</echo>
     <junit printsummary="yes" fork="yes" failureproperty="htmlunit.test.failed">
       <jvmarg value="-Djava.endorsed.dirs=lib/endorsed"/>
       <jvmarg value="-Djunit.test.loglevel=${junit.test.loglevel}"/>
@@ -112,7 +113,7 @@
       <formatter type="xml"/>
       <batchtest todir="${build.test.htmlunit.output}">
         <fileset dir="${build.test.htmlunit}">
-          <include name="**/*TestCase.class"/>
+          <include name="${htmlunit.test.include}"/>
           <exclude name="**/HtmlUnitTestCase.class"/>
         </fileset>
       </batchtest>



Mime
View raw message