[jboss-cvs] JBossCache ...

[Pavel Tsekov]

  User: ptsekov 
  Date: 06/12/24 11:00:16

  Modified:    JBossCache  build.xml
  Log:
  * build.xml: Merge the compat-tests target from the 1.4.0 branch.
  * tests/compat/*: Merge org.jboss.tools.SerialVersionUID and 
  org.jboss.cache.compat.SerialVersionUIDUnitTestCase from the 1.4.0 branch.
  
  Revision  Changes    Path
  1.157     +36 -1     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.156
  retrieving revision 1.157
  diff -u -b -r1.156 -r1.157
  --- build.xml	22 Dec 2006 03:28:52 -0000	1.156
  +++ build.xml	24 Dec 2006 16:00:16 -0000	1.157
  @@ -1,6 +1,6 @@
   <?xml version="1.0" encoding="UTF-8"?>
   
  -<!-- $Id: build.xml,v 1.156 2006/12/22 03:28:52 msurtani Exp $ -->
  +<!-- $Id: build.xml,v 1.157 2006/12/24 16:00:16 ptsekov Exp $ -->
   
   <project default="compile" name="JBossCache">
   
  @@ -19,6 +19,7 @@
      <property name="interop.tests.dir" value="${tests.dir}/interop"/>
      <property name="perf.tests.dir" value="${tests.dir}/perf"/>
      <property name="interop.tests.dir" value="${tests.dir}/interop"/>
  +   <property name="compat.tests.dir" value="${tests.dir}/compat"/>
      <property name="etc.dir" value="${root.dir}/etc"/>
      <property name="dependencies" value="dependencies.xml"/>
      <property name="resources.dir" value="${root.dir}/src-50/resources"/>
  @@ -44,10 +45,18 @@
      <property name="junit.timeout" value="300000"/>
      <property name="junit.timeout.stresstest" value="6000000"/>
      <property name="junit.timeout.performance" value="60000"/>
  +   <property name="junit.timeout.compat" value="300000"/>
      <property name="junit.batchtest.todir" value="${build.reports}"/>
      <property name="junit.jvm.options" value="-Ddummy"/>
      <property name="ant.dir" value="${root.dir}/ant-dist"/>
      <property name="manifest.file" value="${dist.lib}/default.mf"/>
  +   <!-- -->
  +   <condition property="ENABLE_COMPAT_TESTS">
  +      <or>
  +         <equals arg1="${ant.java.version}" arg2="1.5"/>
  +         <equals arg1="${ant.java.version}" arg2="1.4"/>
  +      </or>
  +   </condition>
      <property name="src.dir.50" value="${root.dir}/src-50"/>
      <property name="tests.dir.50" value="${root.dir}/tests-50"/>
      <property name="output.resources.dir" value="${output.dir}/resources"/>
  @@ -194,6 +203,7 @@
            <src path="${stress.tests.dir}"/>
            <src path="${perf.tests.dir}"/>
            <src path="${interop.tests.dir}"/>
  +         <src path="${compat.tests.dir}"/>
            <classpath path="${compile.dir}"/>
            <classpath refid="library.classpath"/>
            <exclude name="**/obsolete/**"/>
  @@ -929,6 +939,31 @@
         </sequential>
      </macrodef>
   
  +   <target name="compat-tests" depends="jar, unittests-init"
  +           if="ENABLE_COMPAT_TESTS">
  +      <condition property="libdir.list" value="lib-50,lib, dist/lib-50">
  +         <equals arg1="${ant.java.version}" arg2="1.5"/>
  +      </condition>
  +      <condition property="libdir.list" value="lib, dist/lib">
  +         <equals arg1="${ant.java.version}" arg2="1.4"/>
  +      </condition>
  +
  +      <junit printsummary="yes" timeout="${junit.timeout.compat}" fork="yes"
  +             maxmemory="256m">
  +         <classpath>
  +            <pathelement path="${compiletest.dir}"/>
  +         </classpath>
  +         <sysproperty key="libdir.list" value="${libdir.list}"/>
  +         <formatter type="xml" usefile="true"/>
  +         <batchtest todir="${build.reports}">
  +            <fileset dir="${compat.tests.dir}">
  +               <exclude name="**/tools/**/*"/>
  +               <patternset refid="junit.excludes"/>
  +            </fileset>
  +         </batchtest>
  +      </junit>
  +   </target>
  +
      <target name="unittests"
              depends="functionaltests, perftests, stresstests"
              description="Run all non-AOP unit tests (functional, perf, stress)"/>