You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sm...@apache.org on 2007/03/15 11:22:02 UTC
svn commit: r518562 - in /harmony/enhanced/classlib/trunk:
make/properties.xml modules/lang-management/build.xml
Author: smishura
Date: Thu Mar 15 03:22:01 2007
New Revision: 518562
URL: http://svn.apache.org/viewvc?view=rev&rev=518562
Log:
Apply modified patch to 'lang-management' module from HARMONY-3187:
([classlib][testing] test case should be run only once when specified through the command line)
Modified:
harmony/enhanced/classlib/trunk/make/properties.xml
harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?view=diff&rev=518562&r1=518561&r2=518562
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Thu Mar 15 03:22:01 2007
@@ -380,6 +380,18 @@
</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}/*Test" to="*Test.java" />
+ <globmapper from="${basedir}/*.java" to="*.java" />
+ </compositemapper>
+ </pathconvert>
+
<!-- Concatenate several exclude lists into single list -->
<macrodef name="prepare-exclude-list">
<attribute name="moduleName"/>
Modified: harmony/enhanced/classlib/trunk/modules/lang-management/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/lang-management/build.xml?view=diff&rev=518562&r1=518561&r2=518562
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/lang-management/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/lang-management/build.xml Thu Mar 15 03:22:01 2007
@@ -197,12 +197,13 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}" if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.lang-management.src.test.api.java}" >
- <include name="**/*Test.java"/>
- <excludesfile name="${lang-management.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case"/>
+ <excludesfile name="${lang-management.exclude.file}" unless="test.case"/>
</fileset>
</batchtest>
</junit>
@@ -234,12 +235,13 @@
<formatter type="xml" />
- <test name="${test.case}" todir="${hy.tests.reports}" if="test.case" />
-
- <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+ <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
<fileset dir="${hy.lang-management.src.test.impl.java}">
- <include name="**/*Test.java" />
- <excludesfile name="${lang-management.exclude.file}" />
+ <!-- if ${test.case} -->
+ <include name="${converted.tc}" if="test.case" />
+ <!-- unless ${test.case} -->
+ <include name="**/*Test.java" unless="test.case" />
+ <excludesfile name="${lang-management.exclude.file}" unless="test.case" />
</fileset>
</batchtest>
</junit>