Added more powerful "test-spec" capabilities and testing timeout to the PLT build script

dlsmith · dlsmith · commit 86ee2837064f · 2006-08-15T20:42:09.000Z
git-svn-id: file:///tmp/test-svn/trunk@3954 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/plt/build.xml b/plt/build.xml
@@ -14,9 +14,10 @@
   <property name="java14-home" value="${env.JAVA14_HOME}" />
   <property name="clover-jar" value="${env.CLOVER_JAR}" />
   
-  
-  <!-- By default, don't filter tests on anything -->
+  <!-- Testing defaults -->
   <property name="test-spec" value="" />
+  <property name="test-repeat" value="1" /> <!-- TODO: Use this value -->
+  <property name="test-timeout" value="1440" />
   
   <!-- By default, clean can fail -->
   <property name="clean-can-fail" value="yes" />
@@ -42,6 +43,8 @@
   <taskdef resource="com/cenqua/ant/antlib.xml" classpath="lib/buildlib/cenquatasks.jar" />
   <extendclasspath path="lib/buildlib/junit.jar" />
 
+  <!-- Extension containing various tools, including "for" and "if" -->
+  <taskdef resource="net/sf/antcontrib/antlib.xml" classpath="lib/buildlib/ant-contrib.jar"/>
                  
   <!-- ***********
        Help Target
@@ -223,10 +226,60 @@
   <target name="test" depends="test-15" description="Shortcut for 'test-15'">
   </target>
 
- 
-  <target name="test-15" depends="compile-15, assert-15"
+  <target name="test-15" depends="compile-15"
           description="Run all 5.0 tests under Java 5.0 (after compiling); use -Dtest-spec=... to filter">
-    <echo message="Running all 5.0 tests matching '${test-spec}' under Java 5.0" />
+    <antcall target="iterate-tests">
+      <param name="do-test-target" value="do-test-15" />
+    </antcall>
+  </target>
+  
+  <target name="test-14" depends="compile-14"
+          description="Run all 1.4 tests under Java 1.4 (after compiling); use -Dtest-spec=... to filter">
+    <antcall target="iterate-tests">
+      <param name="do-test-target" value="do-test-14" />
+    </antcall>
+  </target>
+  
+  <target name="test-14-in-15" depends="compile-14, assert-15"
+          description="Run all 1.4 tests under Java 5.0 (after compiling); use -Dtest-spec=... to filter">
+    <antcall target="iterate-tests">
+      <param name="do-test-target" value="do-test-14-in-15" />
+    </antcall>
+  </target>
+  
+  <target name="iterate-tests">
+    <if>
+      <equals arg1="${test-spec}" arg2="" />
+      <then>
+        <limit minutes="${test-timeout}" failonerror="true">
+          <antcall target="${do-test-target}">
+            <param name="test-filter-string" value="" />
+          </antcall>
+        </limit>
+      </then>
+      <else>
+        <for list="${test-spec}" param="test-filter-string-attribute">
+          <sequential>
+            <limit minutes="${test-timeout}" failonerror="true">
+              <antcall target="${do-test-target}">
+                <param name="test-filter-string" value="@{test-filter-string-attribute}" />
+              </antcall>
+            </limit>
+          </sequential>
+        </for>
+      </else>
+    </if>
+  </target>
+  
+  <selector id="tests-to-run">
+    <and>
+      <filename name="**/*${test-filter-string}*/**" />
+      <filename name="**/*Test.class" />
+    </and>
+  </selector>
+ 
+  <target name="do-test-15" depends="assert-15">
+    <echo message="Running all 5.0 tests matching '${test-filter-string}' under Java 5.0" />
     <junit haltonfailure="yes" fork="yes" forkmode="perTest" maxmemory="256M" dir="${basedir}">
       <classpath>
         <pathelement location="lib/buildlib/junit.jar" />
@@ -237,14 +290,14 @@
       </classpath>
       <formatter type="brief" usefile="false" />
       <batchtest>
-        <fileset dir="classes/test" includes="**/*${test-spec}*Test.class" />
+        <fileset dir="classes/test">
+          <selector refid="tests-to-run" />
+        </fileset>
       </batchtest>
     </junit>
-    
   </target>
 
-  <target name="test-14" depends="compile-14, resolve-java14-exec"
-          description="Run all 1.4 tests under Java 1.4 (after compiling); use -Dtest-spec=... to filter">
+  <target name="do-test-14" depends="resolve-java14-exec">
     <echo message="Running all 1.4 tests matching '${test-spec}' under Java 1.4" />
     <junit haltonfailure="yes" fork="yes" forkmode="perTest" maxmemory="256M" jvm="${java14-exec}" dir="${basedir}">
       <classpath>
@@ -256,13 +309,14 @@
       </classpath>
       <formatter type="brief" usefile="false" />
       <batchtest>
-        <fileset dir="classes/test-14" includes="**/*${test-spec}*Test.class" />
+        <fileset dir="classes/test-14">
+          <selector refid="tests-to-run" />
+        </fileset>
       </batchtest>
     </junit>
   </target>
 
-  <target name="test-14-in-15" depends="compile-14, assert-15"
-          description="Run all 1.4 tests under Java 5.0 (after compiling); use -Dtest-spec=... to filter">
+  <target name="do-test-14-in-15" depends="assert-15">
     <echo message="Running all 1.4 tests matching '${test-spec}' under Java 5.0" />
     <junit haltonfailure="yes" fork="yes" forkmode="perTest" maxmemory="256M" dir="${basedir}">
       <classpath>
@@ -274,7 +328,9 @@
       </classpath>
       <formatter type="brief" usefile="false" />
       <batchtest>
-        <fileset dir="classes/test-14" includes="**/*${test-spec}*Test.class" />
+        <fileset dir="classes/test-14">
+          <selector refid="tests-to-run" />
+        </fileset>
       </batchtest>
     </junit>
   </target>
diff --git a/plt/lib/buildlib/ant-contrib.jar b/plt/lib/buildlib/ant-contrib.jar
diff --git a/plt/lib/readme.txt b/plt/lib/readme.txt
@@ -6,6 +6,7 @@ buildlib/*.jar: Binaries used in the build process, but that should not be part
 VERSIONS:
 
 retroweaver-rt-1.2.3.jar: Retroweaver 1.2.3
+buildlib/ant-contrib.jar: ANT Contrib 1.0b2
 buildlib/cenquatasks.jar: Distributed with Clover 1.3.9
 buildlib/junit.jar: JUnit 3.8.1
 buildlib/retroweaver-all-1.2.3.jar: Retroweaver 1.2.3
