axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seib...@apache.org
Subject cvs commit: xml-axis/java/xmls targets.xml
Date Wed, 18 Sep 2002 14:39:08 GMT
seibert     2002/09/18 07:39:08

  Modified:    java     build.xml buildTest.xml
               java/xmls targets.xml
  Log:
  This separates out the junit and functional tests into two targets
  so that when you run one, it only does what is needed.
  
  It also makes the comment on "my-forking-ant" a little more friendly
  
  This also fixes the problem that running "ant all" doesn't run junit tests
  
  Revision  Changes    Path
  1.191     +22 -11    xml-axis/java/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/build.xml,v
  retrieving revision 1.190
  retrieving revision 1.191
  diff -u -r1.190 -r1.191
  --- build.xml	17 Sep 2002 20:21:56 -0000	1.190
  +++ build.xml	18 Sep 2002 14:39:07 -0000	1.191
  @@ -197,16 +197,27 @@
   
     <target name="buildTest" depends="compile" if="junit.present" unless="tests.built">
       <echo message="junit package found ..."/>
  +     <antcall target="buildJunit"/>
  +     <antcall target="buildFunctional"/>
  +    <property name="tests.built" value="yes"/>
  +    <echo message="Tests property set ${tests.built}"/>
  +  </target>
  +
  +  <target name="buildJunit" depends="compile" if="junit.present">
  +    <echo message="junit package found ..."/>
        <antcall target="my-forking-ant">
          <param name="dir" value="${axis.home}"/>
          <param name="file" value="buildTest.xml"/>
  -       <param name="target" value="compile"/>
  +       <param name="target" value="compileJunit"/>
  +     </antcall>
  +  </target>
  +  <target name="buildFunctional" depends="compile" if="junit.present">
  +    <echo message="junit package found ..."/>
  +     <antcall target="my-forking-ant">
  +       <param name="dir" value="${axis.home}"/>
  +       <param name="file" value="buildTest.xml"/>
  +       <param name="target" value="compileFunctional"/>
        </antcall>
  -    <!--
  -      <ant antfile="${axis.home}/buildTest.xml" target="compile"/>
  -    -->
  -    <property name="tests.built" value="yes"/>
  -    <echo message="Tests property set ${tests.built}"/>
     </target>
   
     <!-- =================================================================== -->
  @@ -226,7 +237,7 @@
     <!-- =================================================================== -->
     <!-- Runs the JUnit package testcases -->
     <!-- =================================================================== -->
  -  <target name="junit" depends="buildTest" if="junit.present" >
  +  <target name="junit" depends="buildJunit" if="junit.present" >
       <mkdir dir="${test.functional.reportdir}" />
       <ant antfile="${axis.home}/buildTest.xml" target="junit"/>
     </target>
  @@ -259,7 +270,7 @@
     <!-- =================================================================== -->
     <!-- Functional tests, no server (for testing under debugger)            -->
     <!-- =================================================================== -->
  -  <target name="functional-tests-noserver" depends="compile, buildTest"
  +  <target name="functional-tests-noserver" depends="compile, buildFunctional"
       description="functional tests, no server">
       <ant antfile="test/build_functional_tests.xml" target="junit-functional-noserver">
         <property name="test.functional.usefile" value="${test.functional.usefile}"/>
  @@ -274,7 +285,7 @@
     <!-- =================================================================== -->
     <!-- Functional tests, with server                                       -->
     <!-- =================================================================== -->
  -  <target name="functional-tests" depends="buildTest" description="functional tests">
  +  <target name="functional-tests" depends="buildFunctional" description="functional
tests">
       <ant antfile="${axis.home}/buildTest.xml" target="functional-tests"/>
     </target>
   
  @@ -309,7 +320,7 @@
     <!-- =================================================================== -->
     <!-- Build/Test EVERYTHING from scratch!                                 -->
     <!-- =================================================================== -->
  -  <target name="all" depends="dist, functional-tests"
  +  <target name="all" depends="dist, junit, functional-tests"
         description="do everything: distribution build and functional tests"
       />
   
  @@ -358,7 +369,7 @@
       </copy>
     </target>
   
  -  <target name="dist" depends="compile, javadocsdist, samples, buildTest, junit"
  +  <target name="dist" depends="compile, javadocsdist, samples, junit"
       description="create the full binary distribution">
       <mkdir dir="${dist.dir}"/>
       <mkdir dir="${dist.dir}/lib"/>
  
  
  
  1.39      +24 -0     xml-axis/java/buildTest.xml
  
  Index: buildTest.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/buildTest.xml,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- buildTest.xml	17 Sep 2002 22:21:34 -0000	1.38
  +++ buildTest.xml	18 Sep 2002 14:39:07 -0000	1.39
  @@ -60,11 +60,33 @@
   <!-- =========================================================================== -->
     <target name="compile" depends="printEnv,copy">
       <!-- Compile the code -->
  +    <antcall target="compileJunit"/>
  +    <antcall target="compileFunctional"/>
  +  </target>
  +
  +  <target name="compileJunit" depends="printEnv,copy">
  +    <!-- Compile the code -->
       <foreach target="component-compile" fork="${foreach.fork}">
           <param name="file">
                <fileset dir="${axis.home}" >
                  <patternset>
                    <include name="test/**/build.xml"/>
  +                 <exclude name="test/wsdl/**/build.xml" />
  +                 <exclude name="test/functional/build.xml"/>
  +               </patternset>
  +             </fileset>
  +        </param>
  +     </foreach>
  +  </target>
  +
  +  <target name="compileFunctional" depends="printEnv,copy">
  +    <!-- Compile the code -->
  +    <foreach target="component-compile" fork="${foreach.fork}">
  +        <param name="file">
  +             <fileset dir="${axis.home}" >
  +               <patternset>
  +                 <include name="test/wsdl/**/build.xml" />
  +                 <include name="test/functional/build.xml"/>
                    <exclude name="test/wsdl/attachments/**/build.xml" unless="attachments.present"/>
                    <exclude name="test/wsdl/interop3/**/build.xml" />
                  </patternset>
  @@ -134,12 +156,14 @@
             <path id="deploy.xml.files">
                   <fileset dir="${build.dir}/work">
                     <include name="**/deploy.wsdd"/>
  +                  <exclude name="mssoapinterop/interop*/deploy.wsdd"/>
                   </fileset>
             </path>
   
             <path id="undeploy.xml.files">
                   <fileset dir="${build.dir}/work">
                     <include name="**/undeploy.wsdd"/>
  +                  <exclude name="mssoapinterop/interop*/undeploy.wsdd"/>
                   </fileset>
             </path>
             <property name="deploy.xml.property" refid="deploy.xml.files"/>
  
  
  
  1.31      +1 -16     xml-axis/java/xmls/targets.xml
  
  Index: targets.xml
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/xmls/targets.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- targets.xml	17 Sep 2002 20:21:56 -0000	1.30
  +++ targets.xml	18 Sep 2002 14:39:08 -0000	1.31
  @@ -2,7 +2,7 @@
            This is basically the <ant /> task, except that it forks
           =================================================================== -->
      <target name="my-forking-ant">
  -     <echo message="My Forking Ant"/>
  +     <echo message="Forking a JVM for target ${target} in file ${file}"/>
        <java classname="org.apache.tools.ant.Main" fork="yes" dir="${dir}">
          <classpath refid="classpath"/>
          <arg line="-buildfile ${file} ${target}"/>
  @@ -25,11 +25,6 @@
     <target name="component-compile">
           <echo message="${file}"/>
           <ant antfile="${file}" target="compile"/>
  -      <!--
  -        <exec executable="ant">
  -           <arg line="-buildfile ${file} compile"/>
  -        </exec>
  -      -->
     </target>
   
     <!-- ===================================================================
  @@ -39,11 +34,6 @@
     <target name="batch-component-test">
       <antcall target="echo-file"/>
       <ant antfile="${file}" target="component-junit-functional"/>
  -      <!--
  -        <exec executable="ant">
  -           <arg line="-buildfile ${file} component-junit-functional"/>
  -        </exec>
  -      -->
     </target>
   
     <!-- ===================================================================
  @@ -52,11 +42,6 @@
     <target name="batch-component-run">
       <antcall target="echo-file"/>
       <ant antfile="${file}" target="run"/>
  -      <!--
  -        <exec executable="ant">
  -           <arg line="-buildfile ${file} run"/>
  -        </exec>
  -      -->
     </target>
   
     <!-- =================================================================== -->
  
  
  

Mime
View raw message