harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r572503 - in /harmony/enhanced/jdktools/trunk: make/properties.xml modules/jpda/build.xml modules/tools/build.xml
Date Tue, 04 Sep 2007 03:40:08 GMT
Author: smishura
Date: Mon Sep  3 20:40:07 2007
New Revision: 572503

URL: http://svn.apache.org/viewvc?rev=572503&view=rev
Log:
Add 'test.case' option to jdktools build

Modified:
    harmony/enhanced/jdktools/trunk/make/properties.xml
    harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
    harmony/enhanced/jdktools/trunk/modules/tools/build.xml

Modified: harmony/enhanced/jdktools/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/properties.xml?rev=572503&r1=572502&r2=572503&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/properties.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/properties.xml Mon Sep  3 20:40:07 2007
@@ -351,6 +351,17 @@
         </sequential>
     </macrodef>
 
+    <!-- To use with -Dtest.case=... option                   -->
+    <!-- if ${test.case} is provided in package+class form    -->
+    <!-- it is converted to dir+filename form                 -->
+    <pathconvert property="converted.tc" >
+        <path path="${test.case}"/>
+        <compositemapper>
+            <unpackagemapper from="${basedir}${file.separator}*Test" to="*Test.java" />
+            <globmapper from="${basedir}${file.separator}*.java" to="*.java" />
+        </compositemapper>
+    </pathconvert>
+
     <!-- Concatenate several exclude lists into single list -->
     <macrodef name="prepare-exclude-list">
        <attribute name="moduleName"/>

Modified: harmony/enhanced/jdktools/trunk/modules/jpda/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/jpda/build.xml?rev=572503&r1=572502&r2=572503&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/jpda/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/jpda/build.xml Mon Sep  3 20:40:07 2007
@@ -251,22 +251,31 @@
 
             <!-- short running tests-->
             <batchtest todir="${hy.tests.reports}" haltonfailure="off" unless="test.case">
+
                 <fileset dir="${hy.jpda.src.test}">
-                    <include name="**/*Test.java"/>
-                    <exclude name="**/org/apache/harmony/jpda/tests/jdwp/MultiSession/*Test.java"
/>
-                    <exclude name="**/org/apache/harmony/jpda/tests/jdwp/ThreadReference/StopTest.java"
/>
-                    <exclude name="**/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/HoldEventsTest.java"
/>
-                    <excludesfile name="${jpda.exclude.file}" />
+                    <!-- if ${test.case}     -->
+                    <include name="${converted.tc}" if="test.case" />
+
+                    <!-- unless ${test.case} -->
+                    <include name="**/*Test.java" unless="test.case" />
+                    <exclude name="**/org/apache/harmony/jpda/tests/jdwp/MultiSession/*Test.java"
unless="test.case" />
+                    <exclude name="**/org/apache/harmony/jpda/tests/jdwp/ThreadReference/StopTest.java"
unless="test.case" />
+                    <exclude name="**/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/HoldEventsTest.java"
unless="test.case" />
+                    <excludesfile name="${jpda.exclude.file}" unless="test.case" />
                 </fileset>
             </batchtest>
 
             <!-- long running tests-->
             <batchtest todir="${hy.tests.reports}" haltonfailure="off" unless="test.case">
                 <fileset dir="${hy.jpda.src.test}">
-                    <include name="**/org/apache/harmony/jpda/tests/jdwp/MultiSession/*Test.java"
/>
-                    <include name="**/org/apache/harmony/jpda/tests/jdwp/ThreadReference/StopTest.java"
/>
-                    <include name="**/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/HoldEventsTest.java"
/>
-                    <excludesfile name="${jpda.exclude.file}" />
+                    <!-- if ${test.case}     -->
+                    <include name="${converted.tc}" if="test.case" />
+
+                    <!-- unless ${test.case} -->
+                    <include name="**/org/apache/harmony/jpda/tests/jdwp/MultiSession/*Test.java"
unless="test.case" />
+                    <include name="**/org/apache/harmony/jpda/tests/jdwp/ThreadReference/StopTest.java"
unless="test.case" />
+                    <include name="**/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/HoldEventsTest.java"
unless="test.case" />
+                    <excludesfile name="${jpda.exclude.file}" unless="test.case" />
                 </fileset>
             </batchtest>
         </junit>

Modified: harmony/enhanced/jdktools/trunk/modules/tools/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/modules/tools/build.xml?rev=572503&r1=572502&r2=572503&view=diff
==============================================================================
--- harmony/enhanced/jdktools/trunk/modules/tools/build.xml (original)
+++ harmony/enhanced/jdktools/trunk/modules/tools/build.xml Mon Sep  3 20:40:07 2007
@@ -216,8 +216,12 @@
                                    unless="test.case">
 
                 <fileset dir="${hy.tools.src.test.java}">
-                    <include name="**/*Test.java"/>
-                    <excludesfile name="${tools.exclude.file}" />
+                    <!-- if ${test.case}     -->
+                    <include name="${converted.tc}" if="test.case" />
+
+                    <!-- unless ${test.case} -->
+                    <include name="**/*Test.java" unless="test.case" />
+                    <excludesfile name="${tools.exclude.file}" unless="test.case" />
                 </fileset>
             </batchtest>
         </junit>



Mime
View raw message