svn commit: r644187 - in /harmony/enhanced/buildtest/trunk/infra: build.xml scripts/setup.xml

[sm...@apache.org]

Author: smishura
Date: Wed Apr  2 23:49:59 2008
New Revision: 644187

URL: http://svn.apache.org/viewvc?rev=644187&view=rev
Log:
Implements dependency tracking for setup (done similar as for run)

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

Modified: harmony/enhanced/buildtest/trunk/infra/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/build.xml?rev=644187&r1=644186&r2=644187&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/build.xml Wed Apr  2 23:49:59 2008
@@ -261,7 +261,30 @@
                 inheritrefs="true">
             <dirset dir="${adaptors.dir}" includes="${installed.suites.list}" />
         </subant>
+
+        <!-- check status: get the list of failed suites -->
+        <loadfile property="failed.list" srcfile="${tmp.file}">
+            <filterchain>
+                <linecontains>
+                    <contains value="=true" />
+                </linecontains>
+                <tokenfilter>
+                    <replaceregex pattern="([^=])=true" replace="\1" />
+                </tokenfilter>
+                <tokenfilter>
+                    <filetokenizer />
+                    <replaceregex pattern="\n" replace="," flags="gs" />
+                </tokenfilter>
+            </filterchain>
+        </loadfile>
         <delete file="${tmp.file}" />
+
+        <fail>
+            <condition>
+                <isset property="failed.list" />
+            </condition>
+            The following suites failed: ${failed.list}
+        </fail>
     </target>
 
     <!-- ================================================================== 

Modified: harmony/enhanced/buildtest/trunk/infra/scripts/setup.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/scripts/setup.xml?rev=644187&r1=644186&r2=644187&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/scripts/setup.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/scripts/setup.xml Wed Apr  2 23:49:59 2008
@@ -17,30 +17,43 @@
 
 <project name="setup" basedir=".">
 
-    <target name="-setup-suite" if="need.setup" depends="-init">
+    <import file="framework.xml" />
 
+    <target name="-setup-suite" if="need.setup" depends="-check-if-was-setup">
+
+        <!-- mark a suite as running -->
         <echo message="#${suite.name}#" file="${tmp.file}" append="true" />
 
-        <!-- TODO: fail only if setup of dependency failed -->
+        <!-- dependencies go first -->
         <setup-dependencies suite="${suite.name}" />
 
-        <!-- setup suite -->
-        <property file="${config.dir}/${suite.name}.properties" />
-        <ant dir="${adaptors.dir}/${suite.name}"
-             antfile="${adaptors.dir}/${suite.name}/adaptor.xml"
-             target="setup"
-             inheritAll="true">
-            <property name="suite.adaptor.dir"
-                      location="${adaptors.dir}/${suite.name}" />
-        </ant>
+        <!-- fork suite's run as a separate process. This lets the build:
+             * to import framework.xml as several adaptors use it
+             * to complete even some suites failed
+               (but fail if dependency failed. see target '-setup-dependencies')
+        -->
+        <exec-ant dir="${scripts.dir}"
+                  file="setup.xml"
+                  targets="setup"
+                  failonerror="${failonerror}"
+                  failproperty="suite.failed">
+            <sysproperty key="suite.name" value="${suite.name}" />
+            <sysproperty key="config.dir" value="${config.dir}" />
+        </exec-ant>
+
+        <!-- store suite's execution status -->
+        <echo file="${tmp.file}" append="true">
+${suite.name}=${suite.failed}
+        </echo>
     </target>
 
-    <target name="-init">
+    <target name="-check-if-was-setup">
 
         <basename file="${basedir}" property="suite.name" />
         <condition property="need.setup">
             <isfileselected file="${tmp.file}">
                 <not>
+                    <!-- find the marker to see if a suite was setup or not -->
                     <contains text="#${suite.name}#" casesensitive="yes" />
                 </not>
             </isfileselected>
@@ -77,7 +90,21 @@
             <property name="config.dir" value="${config.dir}" />
             <property name="scripts.dir" value="${scripts.dir}" />
             <property name="tmp.file" value="${tmp.file}" />
+
+            <!-- fail if dependency failed -->
+            <property name="failonerror" value="true" />
         </subant>
     </target>
 
+    <target name="setup">
+        <property file="${config.dir}/${suite.name}.properties" />
+
+        <ant dir="${adaptors.dir}/${suite.name}"
+             antfile="adaptor.xml"
+             target="setup"
+             inheritall="true">
+            <property name="suite.adaptor.dir"
+                      location="${adaptors.dir}/${suite.name}" />
+        </ant>
+    </target>
 </project>