[jboss-cvs] system2 ...

[Scott Stark]

  User: starksm 
  Date: 06/07/17 22:23:04

  Modified:    system2  build-test.xml
  Log:
  Add a tests-support-jars target that creates separarte test jars for classes not on the junit classpath.
  
  Revision  Changes    Path
  1.6       +44 -18    system2/build-test.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build-test.xml
  ===================================================================
  RCS file: /cvsroot/jboss/system2/build-test.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- build-test.xml	17 Jul 2006 01:37:46 -0000	1.5
  +++ build-test.xml	18 Jul 2006 02:23:04 -0000	1.6
  @@ -49,13 +49,29 @@
         <property name="module.name" value="container" />
         <property name="module.Name" value="JBoss Container" />
         <property name="module.version" value="M1" />
  +      <property name="source.java" value="${module.source}/tests" />
  +      <property name="javac.target" value="1.5" />
  +      <property name="javac.source" value="1.5" />
  +      <property name="build.classes" value="${module.output}/classes-tests" />
  +      <property name="build.testlog" value="${module.output}/log" />
  +      <property name="build-bypass.disabled" value="true" />
  +      <property name="tests.support.classes" value="output/tests-support/classes" />
  +      <property name="tests.support.lib" value="output/tests-support/lib" />
         <!-- jbosstest.deploy.dir is a URI -->
         <pathconvert targetos="unix" property="jbosstest.deploy.path">
            <path>
               <pathelement location="${module.output}/lib" />
            </path>
         </pathconvert>
  +      <!-- Test hotdeployment root directory -->
         <property name="jbosstest.deploy.dir" value="file:${jbosstest.deploy.path}" />
  +      <!-- Support test classes lib root -->
  +      <pathconvert targetos="unix" property="jbosstest.support.path">
  +         <path>
  +            <pathelement location="${module.output}/tests-support/lib" />
  +         </path>
  +      </pathconvert>
  +      <property name="jbosstest.support.dir" value="file:${jbosstest.support.path}" />
   
         <!-- ========= -->
         <!-- Libraries -->
  @@ -108,13 +124,6 @@
         <!-- Tasks -->
         <!-- ===== -->
   
  -      <property name="source.java" value="${module.source}/tests" />
  -      <property name="javac.target" value="1.5" />
  -      <property name="javac.source" value="1.5" />
  -      <property name="build.classes" value="${module.output}/classes-tests" />
  -      <property name="build.testlog" value="${module.output}/log" />
  -      <property name="build-bypass.disabled" value="true" />
  -
         <call target="_default:task-init" />
   
         <path id="thirdparty.classpath">
  @@ -145,22 +154,34 @@
      <!-- Archives                                                           -->
      <!-- ================================================================== -->
   
  -   <!-- 
  -     |  Build all jar files.
  -    -->
  -   <target name="module-jars" depends="init">
  +   <target name="module-jars" depends="init, tests-support-jars" />
  +
  +   <target name="tests-support-jars" depends="init"
  +      description="Compiles and creates the tests-support tree jars">
   
  -      <jar jarfile="${build.lib}/jboss-system-test.jar" manifest="${build.etc}/default.mf">
  -         <fileset dir="${build.classes}" />
  -      </jar>
   
  -      <jar destfile="${build.lib}/org.jboss.server.support.jar">
  +      <path id="tests-support.classpath">
  +         <path refid="library.classpath" />
  +         <path refid="dependentmodule.classpath" />
  +      </path>
  +      <mkdir dir="${tests.support.classes}" />
  +      <mkdir dir="${tests.support.lib}" />
  +      <javac destdir="${tests.support.classes}"
  +        target="${javac.target}"
  +        source="${javac.source}"
  +        debug="${javac.debug}"
  +        failonerror="true">
  +        <src path="src/tests-support"/>
  +        <classpath refid="tests-support.classpath"/>
  +      </javac>
  +
  +      <jar destfile="${tests.support.lib}/org.jboss.server.support.jar">
            <manifest>
               <attribute name="Specification-Title" value="Support" />
               <attribute name="Specification-Version" value="1.0.0.GA" />
               <attribute name="Specification-Vendor" value="JBoss Inc." />
            </manifest>
  -         <zipfileset dir="${build.classes}">
  +         <zipfileset dir="${tests.support.classes}">
               <include name="org/jboss/test/server/support/**" />
            </zipfileset>
         </jar>
  @@ -171,7 +192,8 @@
      <!-- Tests                                                              -->
      <!-- ================================================================== -->
   
  -   <target name="tests" depends="most" description="Execute all tests in the given test directory.">
  +   <target name="tests" depends="most"
  +      description="Execute all tests in the given test directory.">
         <mkdir dir="${build.reports}" />
         <mkdir dir="${build.testlog}" />
         <!-- Remove the test.log so each run has a fresh log -->
  @@ -179,6 +201,9 @@
         <junit dir="${module.output}" printsummary="yes" haltonerror="false" haltonfailure="false" fork="true">
   
            <sysproperty key="build.testlog" value="${build.testlog}" />
  +         <syspropertyset id="jbosstest-properties">
  +            <propertyref prefix="jbosstest" />
  +         </syspropertyset>
   
            <classpath>
               <pathelement location="${build.classes}" />
  @@ -199,7 +224,8 @@
         </junit>
      </target>
   
  -   <target name="one-test" depends="init" description="Execute all tests in the given test directory.">
  +   <target name="one-test" depends="init"
  +      description="Execute the test defined by ${test}">
         <mkdir dir="${build.reports}" />
         <mkdir dir="${build.testlog}" />
         <!-- Remove the test.log so each run has a fresh log -->