cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: rev 37441 - cocoon/branches/BRANCH_2_1_X/tools/targets
Date Fri, 03 Sep 2004 01:38:14 GMT
Author: vgritsenko
Date: Thu Sep  2 18:38:14 2004
New Revision: 37441

Modified:
   cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml
Log:
make "build anteater-tests" run. align.


Modified: cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml	(original)
+++ cocoon/branches/BRANCH_2_1_X/tools/targets/test-build.xml	Thu Sep  2 18:38:14 2004
@@ -56,8 +56,9 @@
 
   <!-- Runs JUnit tests in debug mode -->
   <target name="junit-test-debug" depends="compile-tests, junit-prepare">
-        <fail unless="junit.testcase" 
-              message="Please set the property $${junit.testcase} to a JUnit testcase (package.Classname,
e.g. org.test.MyTestCase)."/>
+    <fail unless="junit.testcase" 
+          message="Please set the property $${junit.testcase} to a JUnit testcase (package.Classname,
e.g. org.test.MyTestCase)."/>
+
     <echo message="The JVM will be suspended until you connect with your favourite debugger
to port ${junit.test.debugport}."/>
     <junit printsummary="yes" fork="yes" failureproperty="junit.test.failed">
       <jvmarg value="-Xdebug"/>
@@ -81,87 +82,87 @@
     <fail if="junit.test.failed" message="One or more JUnit tests failed or caused errors.
Please have a look into the report for details."/>
   </target>
 
-      <!-- Block tests -->
-      <target name="block-tests" depends="compile-tests, prepare-blocks">
-        <ant antfile="${build.temp}/blocks-build.xml"
-             inheritAll="true"
-             inheritRefs="false"
-             target="tests"/>
-      </target>      
+  <!-- Block tests -->
+  <target name="block-tests" depends="compile-tests, prepare-blocks">
+    <ant antfile="${build.temp}/blocks-build.xml"
+         inheritAll="true"
+         inheritRefs="false"
+         target="tests"/>
+  </target>      
   
   <!--+
       | Anteater tests
       +-->
       
-      <!-- Ant macro that calls anteater -->
-      <macrodef name="call-anteater">
-        <attribute name="script"/>
-        <attribute name="target"/>
-        <attribute name="targetfile"/>
-        <sequential>
-    <java classname="org.apache.tools.ant.Main" fork="true">
-      <classpath>
-        <fileset dir="${anteater.home}">
-          <include name="lib/**/*.jar"/>
-          <include name="tomcat/**/*.jar"/>
-        </fileset>
-        <pathelement location="${anteater.home}/resources"/>
-      </classpath>
-      <jvmarg value="-Dant.home=${anteater.home}"/>
-      <jvmarg value="-Danteater.home=${anteater.home}"/>
-      <jvmarg value="-Danteater.resources=${anteater.home}/resources"/>
-      <jvmarg value="-Danteater.report=${anteater.home}/resources/scripts/report.xml"/>
-      <jvmarg value="-Djava.endorsed.dirs=${anteater.home}/lib"/>
-            <arg line="-f ${build.test}/anteater/@{script} -Dhost=${anteater.target.host}
-Dport=${anteater.target.port} -Dbase=${anteater.target.base.path} -Ddefault.haltonerror=${anteater.option.haltonerror}
-Dtargetfile=@{targetfile} @{target}"/>
-    </java>
-        </sequential>
-      </macrodef>
+  <!-- Ant macro that calls anteater -->
+  <macrodef name="call-anteater">
+    <attribute name="script"/>
+    <attribute name="target"/>
+    <attribute name="targetfile"/>
+    <sequential>
+      <java classname="org.apache.tools.ant.Main" fork="true">
+        <classpath>
+          <fileset dir="${anteater.home}">
+            <include name="lib/**/*.jar"/>
+            <include name="tomcat/**/*.jar"/>
+          </fileset>
+          <pathelement location="${anteater.home}/resources"/>
+        </classpath>
+        <jvmarg value="-Dant.home=${anteater.home}"/>
+        <jvmarg value="-Danteater.home=${anteater.home}"/>
+        <jvmarg value="-Danteater.resources=${anteater.home}/resources"/>
+        <jvmarg value="-Danteater.report=${anteater.home}/resources/scripts/report.xml"/>
+        <jvmarg value="-Djava.endorsed.dirs=${anteater.home}/lib"/>
+        <arg line="-f ${build.test}/anteater/@{script} -Dhost=${anteater.target.host}
-Dport=${anteater.target.port} -Dbase=${anteater.target.base.path} -Ddefault.haltonerror=${anteater.option.haltonerror}
-Dtargetfile=@{targetfile} @{target}"/>
+      </java>
+    </sequential>
+  </macrodef>
       
-      <!-- check whether Anteater is installed and available -->
-      <macrodef name="check-anteater">
-        <sequential>
-          <!-- anteater parameters are set in build.properties -->
-          <available file="${anteater.home}" property="anteater.present"/>
-          <fail unless="anteater.present"
-                message="To use anteater, please install it and set anteater.home (currently
${anteater.home}) in your local.build.properties"/>          
-        </sequential>
-      </macrodef>
-
-      <macrodef name="anteater-notes">
-        <sequential>
-          <echo>*** Anteater notes ***</echo>
-          <echo>a) To run these tests, another instance of Cocoon must be</echo>
-          <echo>   running at ${anteater.target.host}:${anteater.target.port} (base
path=${anteater.target.base.path})</echo>
-          <echo>b) JDK 1.4.x is required to run these tests, but running them</echo>
-          <echo>   under 1.4.x to test Cocoon running under 1.3.x should be ok.</echo>
-          <echo>c) anteater options can be set in local.build.properties, and some</echo>
-          <echo>   tests only run if enabled there.</echo>
-        </sequential> 
-      </macrodef>
-
-      <!-- Anteater tests  -->
-      <target name="anteater-tests" depends="compile-tests,block-anteater-tests" 
-              description="Runs anteater tests (but no JUnit tests)">
-        <check-anteater/>
-        <anteater-notes/>
-        <call-anteater script="run-tests.xml" target="all"/>
-      </target>
-
-      <!-- Run a SINGLE Anteater tests  -->
-      <target name="anteater-test" depends="compile-tests,block-anteater-tests" 
-              description="Runs a single Anteater test">
-        <check-anteater/>
-        <anteater-notes/>
-        <echo>d) to run the tests in 'calc.xml' call 'build anteater-test -Dtarget=calc'</echo>
-        <call-anteater script="run-tests.xml" target="single" targetfile="${target}"/>
+  <!-- check whether Anteater is installed and available -->
+  <macrodef name="check-anteater">
+    <sequential>
+      <!-- anteater parameters are set in build.properties -->
+      <available file="${anteater.home}" property="anteater.present"/>
+      <fail unless="anteater.present"
+            message="To use anteater, please install it and set anteater.home (currently
${anteater.home}) in your local.build.properties"/>          
+    </sequential>
+  </macrodef>
+
+  <macrodef name="anteater-notes">
+    <sequential>
+      <echo>*** Anteater notes ***</echo>
+      <echo>a) To run these tests, another instance of Cocoon must be</echo>
+      <echo>   running at ${anteater.target.host}:${anteater.target.port} (base path=${anteater.target.base.path})</echo>
+      <echo>b) JDK 1.4.x is required to run these tests, but running them</echo>
+      <echo>   under 1.4.x to test Cocoon running under 1.3.x should be ok.</echo>
+      <echo>c) anteater options can be set in local.build.properties, and some</echo>
+      <echo>   tests only run if enabled there.</echo>
+    </sequential> 
+  </macrodef>
+
+  <!-- Anteater tests  -->
+  <target name="anteater-tests" depends="compile-tests,block-anteater-tests" 
+          description="Runs anteater tests (but no JUnit tests)">
+    <check-anteater/>
+    <anteater-notes/>
+    <call-anteater script="run-tests.xml" target="all" targetfile=""/>
   </target>
 
-      <!-- Block tests -->   
+  <!-- Run a SINGLE Anteater tests  -->
+  <target name="anteater-test" depends="compile-tests,block-anteater-tests" 
+          description="Runs a single Anteater test">
+    <check-anteater/>
+    <anteater-notes/>
+    <echo>d) to run the tests in 'calc.xml' call 'build anteater-test -Dtarget=calc'</echo>
+    <call-anteater script="run-tests.xml" target="single" targetfile="${target}"/>
+  </target>
+
+  <!-- Block tests -->   
   <target name="block-anteater-tests" depends="prepare-blocks">
     <ant antfile="${build.temp}/blocks-build.xml"
          inheritAll="true"
          inheritRefs="false"
          target="prepare-anteater-tests"/>
-      </target>
+  </target>
 
 </project>

Mime
View raw message