[abbot-commits] abbot build.xml,1.187,1.188

[Timothy W. <tw...@us...>]

Update of /cvsroot/abbot/abbot
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6501

Modified Files:
	build.xml 
Log Message:
order tests

Index: build.xml
===================================================================
RCS file: /cvsroot/abbot/abbot/build.xml,v
retrieving revision 1.187
retrieving revision 1.188
diff -C2 -d -r1.187 -r1.188
*** build.xml	9 Oct 2005 03:11:12 -0000	1.187
--- build.xml	9 Oct 2005 03:59:07 -0000	1.188
***************
*** 234,239 ****
      <property name="platform" value="${os.name}-${java.version}"/>
      <property name="test.reports" location="${build}/junit/${platform}"/>
!     <property name="initial.tests"
!       value="**/WindowTrackerTest.java,**/ComponentTestFixtureTest.java,**/*TesterTest.java"/>
      <delete dir="${test.reports}" quiet="true"/>
      <mkdir dir="${test.reports}"/>
--- 234,239 ----
      <property name="platform" value="${os.name}-${java.version}"/>
      <property name="test.reports" location="${build}/junit/${platform}"/>
!     <property name="tests.1" value="**/Robot*Test.java,**/*TesterTest.java,**/*LocationTest.java"/>
!     <property name="tests.2" value="**/*RecorderTest.java,**/script/*Test.java,**/editor/*Test.java,**/editor/**/*Test.java"/>
      <delete dir="${test.reports}" quiet="true"/>
      <mkdir dir="${test.reports}"/>
***************
*** 247,257 ****
        <formatter type="xml"/>
        <batchtest todir="${test.reports}">
!         <!-- Indicate a few tests that are prerequisites. -->
!         <fileset dir="${test.src}"
!                  includes="${initial.tests}"/>
!         <!-- auto-include everything else -->
          <fileset dir="${test.src}"
                   includes="**/*Test.java"
!                  excludes="${initial.tests}"/>
        </batchtest>
        <!--
--- 247,262 ----
        <formatter type="xml"/>
        <batchtest todir="${test.reports}">
!         <!-- Enforce some ordering of tests.
!              Robot support
!              Tester tests
!              Recorder, script, editor tests (depend on testers)
!         -->
          <fileset dir="${test.src}"
                   includes="**/*Test.java"
!                  excludes="${tests.1},${tests.2}"/>
!         <fileset dir="${test.src}"
!                  includes="${tests.1}"/>
!         <fileset dir="${test.src}"
!                  includes="${tests.2}"/>
        </batchtest>
        <!--