cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject cvs commit: cocoon-2.1/tools/targets test-build.xml
Date Fri, 06 Feb 2004 09:30:48 GMT
bdelacretaz    2004/02/06 01:30:48

  Modified:    .        build.properties
               tools/targets test-build.xml
  Log:
  parameters for the anteater-tests build targets are now set in build.properties
  
  Revision  Changes    Path
  1.33      +7 -0      cocoon-2.1/build.properties
  
  Index: build.properties
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/build.properties,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- build.properties	3 Jan 2004 06:35:03 -0000	1.32
  +++ build.properties	6 Feb 2004 09:30:48 -0000	1.33
  @@ -37,6 +37,13 @@
   
   # set $FORREST_HOME and $PATH as instructed by Forrest
   
  +# ---- Anteater ----------------------------------------------------------------
  +
  +anteater.home = /default-from-build.properties/anteater-0.9.16
  +anteater.target.host = localhost
  +anteater.target.port = 8888
  +anteater.target.base.path = /
  +
   # ---- Build -------------------------------------------------------------------
   
   build.root=build
  
  
  
  1.4       +4 -6      cocoon-2.1/tools/targets/test-build.xml
  
  Index: test-build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/tools/targets/test-build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- test-build.xml	13 Jan 2004 11:22:52 -0000	1.3
  +++ test-build.xml	6 Feb 2004 09:30:48 -0000	1.4
  @@ -28,13 +28,11 @@
   
     <!-- Anteater tests  -->
     <target name="anteater-tests" depends="compile-tests,block-anteater-tests">
  -    <property name="host" value="localhost"/>
  -    <property name="port" value="8888"/>
  -    <property name="base" value="/"/>
  -    <property name="anteater.home" value="D:\downloads\anteater-0.9.16"/>
  +    <!-- anteater parameters are set in build.properties -->
       <available file="${anteater.home}" property="anteater.present"/>
       <fail unless="anteater.present"
  -          message="Please make sure Anteater is installed in ${anteater.home} or adjust
the anteater.home property"/>
  +          message="To use anteater, please install it and set anteater.home (currently
${anteater.home}) in your local.build.properties"/>
  +    <echo>To run these tests, another instance of Cocoon must be running at ${anteater.target.host}:${anteater.target.port}
(base path=${anteater.target.base.path})</echo>
       <java classname="org.apache.tools.ant.Main" fork="true">
         <classpath>
           <fileset dir="${anteater.home}">
  @@ -48,7 +46,7 @@
         <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/all-tests.xml -Dhost=${host} -Dport=${port}
-Dbase=${base}"/>
  +      <arg line="-f ${build.test}/anteater/all-tests.xml -Dhost=${anteater.target.host}
-Dport=${anteater.target.port} -Dbase=${anteater.target.base.path}"/>
       </java>
     </target>
   
  
  
  

Mime
View raw message