[jboss-cvs] JBossCache ...

Vladmir Blagojevic vladimir.blagojevic at jboss.com
Thu Jan 11 15:36:27 EST 2007


  User: vblagojevic
  Date: 07/01/11 15:36:27

  Modified:    JBossCache  build.xml
  Log:
  JBCACHE-840 (work in progress)
  
  Revision  Changes    Path
  1.168     +41 -16    JBossCache/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/build.xml,v
  retrieving revision 1.167
  retrieving revision 1.168
  diff -u -b -r1.167 -r1.168
  --- build.xml	10 Jan 2007 14:55:47 -0000	1.167
  +++ build.xml	11 Jan 2007 20:36:27 -0000	1.168
  @@ -1,6 +1,6 @@
   <?xml version="1.0" encoding="UTF-8"?>
   
  -<!-- $Id: build.xml,v 1.167 2007/01/10 14:55:47 msurtani Exp $ -->
  +<!-- $Id: build.xml,v 1.168 2007/01/11 20:36:27 vblagojevic Exp $ -->
   
   <project default="compile" name="JBossCache">
   
  @@ -476,12 +476,15 @@
      <!-- ================================================================== -->
   
      <target name="one-test" depends="compile,unittests-init" description="Runs a single unit test">
  +   	  <property name="jgroups.stack" value="udp"/>
  +   	  <echo>Running ${test} using ${jgroups.stack} jgroups stack</echo>
         <junit printsummary="yes" timeout="${junit.timeout.stresstest}" fork="yes">
            <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
            <classpath refid="library.classpath"/>
            <classpath refid="output.classpath"/>
  -         <formatter type="xml" usefile="true"/>
  +         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true" extension="-${jgroups.stack}.xml"/>
            <test name="${test}" todir="${build.reports}"/>
  +      	 <jvmarg value="-Djgroups.stack=${jgroups.stack}"/>
            <jvmarg value="-Dbind.address=${bind.address}"/>
            <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
            <jvmarg value="-Dlib.dir=${lib.dir}"/>
  @@ -498,7 +501,7 @@
            <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
            <jvmarg value="-Dtest.jar.dir=${output.dir}"/>
            <jvmarg value="-Dlib.dir=${lib.dir}"/>
  -         <formatter type="xml" usefile="true"/>
  +         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"/>
            <batchtest todir="${build.reports}">
               <fileset dir="${functional.tests.dir}">
                  <include name="${pkg}/*Test.*"/>
  @@ -524,6 +527,8 @@
   
   
      <target name="one-test-pojocache" depends="compile, unittests-init" description="Runs a single unit test">
  +   	  <property name="jgroups.stack" value="udp"/>
  +   	  <echo>Running pojo test ${test} using ${jgroups.stack} jgroups stack</echo>
         <junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
            <!--  start of Optimizeit support
                  sample script
  @@ -549,6 +554,7 @@
            -->
            <!-- jvmarg value="-Dbind.address=${bind.address}"/ -->
   
  +      	 <jvmarg value="-Djgroups.stack=${jgroups.stack}"/>
            <jvmarg value="-Djboss.aop.path=${output.resources.dir}/pojocache-aop.xml"/>
            <!--
            <jvmarg value="-Djava.system.class.loader=org.jboss.aop.standalone.SystemClassLoader"/>
  @@ -557,7 +563,7 @@
            <classpath refid="output.classpath"/>
            <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
            <classpath refid="library.classpath"/>
  -         <formatter type="xml" usefile="true"/>
  +         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true" extension="-${jgroups.stack}.xml"/>
            <test name="${test}" todir="${build.reports}"/>
         </junit>
      </target>
  @@ -568,7 +574,7 @@
            <classpath refid="output.classpath"/>
            <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
            <classpath refid="library.classpath"/>
  -         <formatter type="xml" usefile="true"/>
  +         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"/>
            <test name="${test}" todir="${build.reports}"/>
         </junit>
      </target>
  @@ -630,14 +636,17 @@
   
      <target name="functionaltests" depends="compile-cache,test-jar,unittests-init"
              description="Runs all core Cache functional tests">
  +   	  <property name="jgroups.stack" value="udp"/>
  +   	  <echo>Running functional tests using ${jgroups.stack} jgroups stack</echo>
         <junit printsummary="yes" timeout="${junit.timeout}" fork="yes" maxmemory="512m">
            <classpath refid="library.classpath"/>
            <classpath refid="output.classpath"/>
            <jvmarg value="-Dbind.address=${bind.address}"/>
  +      	 <jvmarg value="-Djgroups.stack=${jgroups.stack}"/>
            <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
            <jvmarg value="-Dtest.jar.dir=${output.dir}"/>
            <jvmarg value="-Dlib.dir=${lib.dir}"/>
  -         <formatter type="xml" usefile="true"/>
  +         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true" extension="-${jgroups.stack}.xml"/>
            <batchtest todir="${build.reports}">
               <fileset dir="${functional.tests.dir}">
                  <include name="**/*Test.*"/>
  @@ -662,7 +671,7 @@
         <junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
            <classpath refid="library.classpath"/>
            <classpath refid="output.classpath"/>
  -         <formatter type="xml" usefile="true"/>
  +         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"/>
            <jvmarg value="-Djboss.aop.path=${output.resources.dir}/pojocache-aop.xml"/>
            <jvmarg value="-Dbind.address=${bind.address}"/>
            <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
  @@ -686,7 +695,7 @@
            <jvmarg value="-javaagent:${lib.dir}/jboss-aop-jdk50.jar"/>
            <classpath refid="output.classpath"/>
            <classpath refid="library.classpath"/>
  -         <formatter type="xml" usefile="true"/>
  +         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"/>
            <jvmarg value="-Dbind.address=${bind.address}"/>
            <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
            <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
  @@ -705,12 +714,15 @@
   
      <target name="functionalPojoCacheTests" depends="compile, unittests-init"
              description="Runs all PojoCache2.x functional tests">
  +   	  <property name="jgroups.stack" value="udp"/>
  +   	  <echo>Running functional pojo tests using ${jgroups.stack} jgroups stack</echo>
         <junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
  +      	 <jvmarg value="-Djgroups.stack=${jgroups.stack}"/>
            <jvmarg value="-Djboss.aop.path=${output.resources.dir}/pojocache-aop.xml"/>
            <jvmarg value="-javaagent:${lib.dir}/jboss-aop-jdk50.jar"/>
            <classpath refid="output.classpath"/>
            <classpath refid="library.classpath"/>
  -         <formatter type="xml" usefile="true"/>
  +         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true" extension="-${jgroups.stack}.xml"/>
            <jvmarg value="-Dbind.address=${bind.address}"/>
            <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
            <sysproperty key="log4j.configuration" value="file:${etc.dir}/log4j.xml"/>
  @@ -753,7 +765,7 @@
         <junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
            <classpath refid="library.classpath"/>
            <classpath refid="output.classpath"/>
  -         <formatter type="xml" usefile="true"/>
  +         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"/>
            <jvmarg value="-Djboss.aop.path=${output.resources.dir}/pojocache-aop.xml"/>
            <jvmarg value="-Xbootclasspath/p:${bootclasspath}"/>
            <jvmarg value="-Dbind.address=${bind.address}"/>
  @@ -815,12 +827,15 @@
      </target>
   
      <target name="perftests" depends="compile,unittests-init" description="Runs all non-AOP perf tests">
  +   	  <property name="jgroups.stack" value="udp"/>
  +   	  <echo>Running performance tests using ${jgroups.stack} jgroups stack</echo>
         <junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
            <classpath refid="library.classpath"/>
            <classpath refid="output.classpath"/>
  +      	 <jvmarg value="-Djgroups.stack=${jgroups.stack}"/>
            <jvmarg value="-Dbind.address=${bind.address}"/>
            <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
  -         <formatter type="xml" usefile="true"/>
  +         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true" extension="-${jgroups.stack}.xml"/>
            <batchtest todir="${build.reports}">
               <fileset dir="${perf.tests.dir}">
                  <include name="**/*Test.*"/>
  @@ -839,12 +854,15 @@
      </target>
   
      <target name="stresstests" depends="compile,unittests-init" description="Runs all non-AOP perf tests">
  +   	  <echo>Running stress tests using ${jgroups.stack} jgroups stack</echo>
  +   	  <property name="jgroups.stack" value="udp"/>
         <junit printsummary="yes" timeout="${junit.timeout.stresstest}" fork="yes">
            <classpath refid="library.classpath"/>
            <classpath refid="output.classpath"/>
  +      	 <jvmarg value="-Djgroups.stack=${jgroups.stack}"/>
            <jvmarg value="-Dbind.address=${bind.address}"/>
            <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
  -         <formatter type="xml" usefile="true"/>
  +         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true" extension="-${jgroups.stack}.xml"/>
            <batchtest todir="${build.reports}">
               <fileset dir="${stress.tests.dir}">
                  <include name="**/*Test.*"/>
  @@ -936,7 +954,7 @@
            <junit printsummary="yes" timeout="${junit.timeout}" fork="yes">
               <classpath refid="@{classpath}"/>
               <sysproperty key="interop.test.config" value="@{conf}"/>
  -            <formatter type="xml" usefile="true" extension="-@{desc}.xml"/>
  +            <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true" extension="-@{desc}.xml"/>
               <batchtest todir="${build.reports}">
                  <fileset dir="${interop.tests.dir}">
                     <include name="**/*Test.*"/>
  @@ -965,7 +983,7 @@
               <pathelement path="${compiletest.dir}"/>
            </classpath>
            <sysproperty key="libdir.list" value="${libdir.list}"/>
  -         <formatter type="xml" usefile="true"/>
  +         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"/>
            <batchtest todir="${build.reports}">
               <fileset dir="${compat.tests.dir}">
                  <exclude name="**/tools/**/*"/>
  @@ -985,8 +1003,15 @@
   
      <target name="all-unittests-cc"
              description="Run all unit tests, including AOP-based ones (functional, perf, stress) for CruiseControl, (excludes 'known failures')">
  +    
         <antcall target="all-unittests" inheritrefs="false">
            <reference refid="known.failures" torefid="junit.excludes"/>
  +      	 <param name="jgroups.stack" value="udp" /> 
  +      </antcall>
  +   	
  +   	  <antcall target="all-unittests" inheritrefs="false">
  +   	     <reference refid="known.failures" torefid="junit.excludes"/>
  +   	     <param name="jgroups.stack" value="tcp" /> 
         </antcall>
      </target>
   
  @@ -999,7 +1024,7 @@
            <jvmarg value="-Dbind.address=${bind.address}"/>
            <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
            <!--<jvmarg value="-Dtest.jar.dir=${output.dir}"/>-->
  -         <formatter type="xml" usefile="true"/>
  +         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"/>
            <batchtest todir="${build.reports}">
               <fileset dir="${retro.compiletest.dir}">
                  <include name="**/*Test.*"/>
  
  
  



More information about the jboss-cvs-commits mailing list