harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r639550 - in /harmony/enhanced/buildtest/trunk/infra: build.xml scripts/framework.xml
Date Fri, 21 Mar 2008 06:16:00 GMT
Author: smishura
Date: Thu Mar 20 23:15:36 2008
New Revision: 639550

URL: http://svn.apache.org/viewvc?rev=639550&view=rev
Log:
* Add 'install' target
* move 'check-selected-names' target to build.xml
  and make it antcontrib free - it is absent during installation

Modified:
    harmony/enhanced/buildtest/trunk/infra/build.xml
    harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml

Modified: harmony/enhanced/buildtest/trunk/infra/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/build.xml?rev=639550&r1=639549&r2=639550&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/build.xml Thu Mar 20 23:15:36 2008
@@ -67,6 +67,52 @@
     </propertyset>
 
     <!-- ================================================================== 
+                         Install
+         ================================================================== -->
+
+    <target name="install" depends="-check-selected-names" />
+
+    <target name="-check-selected-names">
+
+        <property name="tmp.file" value="tmp.txt" />
+
+        <echo file="${tmp.file}">tmp.file.prop=${test.suites}</echo>
+        <loadproperties srcfile="${tmp.file}">
+            <!-- test suites list may contain spaces -->
+            <filterchain>
+                <replaceregex pattern=" " replace="" flags="g" />
+            </filterchain>
+        </loadproperties>
+
+        <length property="test.suites.names.list.length"
+                string="${test.suites.names.list}" />
+        <length property="tmp.file.prop.length" string="${tmp.file.prop}" />
+
+        <fail>
+            <condition>
+                <and>
+                    <not>
+                        <!-- if an adaptor doesn't exists 
+                             test.suites.names.list doesn't contain it -->
+                        <equals arg1="${tmp.file.prop.length}"
+                                arg2="${test.suites.names.list.length}" />
+                    </not>
+                    <not>
+                        <!-- OK when '*' was specified -->
+                        <equals arg1="${test.suites}" arg2="*" />
+                    </not>
+                </and>
+            </condition>...
+------
+ERROR: Could not found adaptor for some specified test suites
+------ 
+       Please, check the names specified by test.suites property:
+               test.suites=${test.suites}
+        </fail>
+
+        <delete file="${tmp.file}" />
+    </target>
+    <!-- ================================================================== 
                          Framework Setup Functionality
          ================================================================== -->
     <target name="-init-setup">

Modified: harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml?rev=639550&r1=639549&r2=639550&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml Thu Mar 20 23:15:36 2008
@@ -52,38 +52,13 @@
     <!-- Sets up the framework -->
     <target name="setup-framework" 
             depends="load-depends, define-tasks, 
-                        check-selected-names, reorder-suites, -delete-temporal-properties"/>
+                        reorder-suites, -delete-temporal-properties"/>
 
     <!-- Initialize the framework for test execution -->
     <target name="init-framework" 
             depends="load-depends, define-tasks, load-suites-configuration, 
                         load-parameters, -delete-temporal-properties"/>
     
-    <!-- check the names of selected test suites -->
-    <target name="check-selected-names">
-        <if>
-            <not><equals arg1="${test.suites}" arg2="*"/></not>
-        <then>
-            <for list="${test.suites}" param="suite" trim="yes">
-            <sequential>
-                <fail>
-                    <condition>
-                        <not><available 
-                            file="${adaptors.dir}/@{suite}" type="dir"/>
-                        </not>
-                    </condition>...
-------
-ERROR: Could not found adaptor for '@{suite}' test suite. 
------- 
-Please, check the names specified by test.suites property:
-        test.suites=${test.suites}
-                </fail>
-            </sequential>
-            </for>
-        </then>
-        </if>
-    </target>
-
     <!-- load information about external dependencies locations
          obtained on setup stage -->
     <target name="load-depends">



Mime
View raw message