harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r592414 - in /harmony/enhanced/drlvm/trunk/build/make/targets: reg.test.run.xml smoke.test.xml
Date Tue, 06 Nov 2007 13:17:34 GMT
Author: varlax
Date: Tue Nov  6 05:17:34 2007
New Revision: 592414

URL: http://svn.apache.org/viewvc?rev=592414&view=rev
Log:
Handle mistyped test.case consistently: do fail.

Modified:
    harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml?rev=592414&r1=592413&r2=592414&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml Tue Nov  6 05:17:34 2007
@@ -41,11 +41,16 @@
              to specify particular tests to execute -->
         <property name="test.case" value="H*"/>
 
+        <dirset dir="${reg.test.src}" includes="${test.case}" id="reg.run.set">
+            <excludesfile name="${exclude.list}" if="exclude.list"/>
+        </dirset>
+
+        <pathconvert property="reg.dir.list" setonempty="no" refid="reg.run.set"/>
+        <fail unless="reg.dir.list" message="No test found: ${test.case}"/>
+
         <for param="reg.test.2launch">
             <!-- Go through directories containing regression tests -->
-            <dirset dir="${reg.test.src}" includes="${test.case}">
-                <excludesfile name="${exclude.list}" if="exclude.list"/>
-            </dirset>
+            <dirset refid="reg.run.set"/>
             <sequential>
                 <!-- Set up the property pointing to the natives path -->
                 <var name="reg.test.2launch.native.path" unset="true"/>

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml?rev=592414&r1=592413&r2=592414&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml Tue Nov  6 05:17:34 2007
@@ -142,13 +142,17 @@
         <!-- TODO: to allow using package name for test.case, need to convert it to path
         <propertyregex property="test.file" override="yes" global="true"
             input="${test.case}" regexp="(\.|\\)" replace="/"/-->
+        
+        <fileset dir="${smoke.test.src}" id="smoke.run.set">
+            <include name="**/*.java" unless="test.case"/>
+            <include name="${test.case}" if="test.case"/>
+            <excludesfile name="${exclude.file}" if="exclude.file" />
+        </fileset>
+        <pathconvert property="smoke.run.list" setonempty="no" refid="smoke.run.set"/>
+        <fail unless="smoke.run.list" message="No test found: ${test.case}"/>
 
         <for param="test">
-            <fileset dir="${smoke.test.src}">
-                <include name="**/*.java" unless="test.case"/>
-                <include name="${test.case}" if="test.case"/>
-                <excludesfile name="${exclude.file}" if="exclude.file" />
-            </fileset>
+            <fileset refid="smoke.run.set"/>
             <sequential>
                 <!-- unset res.code variable to use it for next run-->
                 <var name="res.code" unset="true"/>



Mime
View raw message