harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r651557 - in /harmony/enhanced/buildtest/trunk/infra: build.xml scripts/cc-exec-adaptor.xml scripts/framework.properties scripts/framework.xml
Date Fri, 25 Apr 2008 10:06:38 GMT
Author: smishura
Date: Fri Apr 25 03:06:34 2008
New Revision: 651557

URL: http://svn.apache.org/viewvc?rev=651557&view=rev
Log:
Remove tracking suites execution status via property file:
CruiseControl doesn't trigger the build in case if superior suite failed

Modified:
    harmony/enhanced/buildtest/trunk/infra/build.xml
    harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml
    harmony/enhanced/buildtest/trunk/infra/scripts/framework.properties
    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=651557&r1=651556&r2=651557&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/build.xml Fri Apr 25 03:06:34 2008
@@ -390,7 +390,6 @@
             </if>
             <mkdir dir="${cc.work.dir}" />
             <mkdir dir="${cc.log.dir}" />
-            <touch file="${cc.execution.status.file}" />
         </sequential>
     </target>
 

Modified: harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml?rev=651557&r1=651556&r2=651557&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/scripts/cc-exec-adaptor.xml Fri Apr 25 03:06:34
2008
@@ -29,9 +29,6 @@
     <property name="suite.adaptor.dir" 
               value="${root.dir}/adaptors/${suite.name}"/>
     
-    <!-- load test suites execution statuses -->
-    <property file="${cc.execution.status.file}"/>
-
     <property name="suite.adaptor.dir" 
               value="${root.dir}/adaptors/${suite.name}"/>
     
@@ -39,41 +36,6 @@
     <target name="cc-run" depends="define-ant-contrib">
         <log message="Test Suite '${suite.name}' execution. Repository updated: ${repository.updated}"/>
 
-        <!-- clear previous status -->
-        <replaceregexp file="${cc.execution.status.file}"
-                       match="^${suite.name}\.parameters\..*$"
-                       replace=""
-                       byline="true"/>
-
-        <!-- FIXME: is this really required?
-             CruiseControl doesn't trigger the
-             build in case of failed buildstatus
-        
-        <check-superior-failures
-            suite="${suite.name}"
-            check-target="run"
-            property="failed.superiors"
-        />
-        -->
-        <if>
-            <isset property="failed.superiors"/>
-        <then>
-            <!-- write 'skipped' status -->
-            <propertyfile file="${cc.execution.status.file}"
-                          comment="${cc.execution.status.file.header}.">
-                <entry key="${suite.name}.parameters.run.skipped" value="true"/>
-            </propertyfile>
-            <echo level="warning">
-Test Suite '${suite.name}' was not executed (SKIPPED) 
-as the following preceding suites on which '${suite.name}' depends upon
-failed to run or have been skipped:
-    ${failed.superiors}
-</echo>
-            <fail message="Execution SKIPPED (failed superiors: ${failed.superiors})."/>
-
-        </then>
-        </if>
-
         <echo file="${cc.execution.log.file}" 
               message="&lt;html>&lt;body>"/>
         <echo file="${cc.execution.log.file}" append="true"
@@ -100,11 +62,6 @@
 ${exception}
 </echo>
             <record name="${cc.execution.log.file}" action="stop"/>
-            <!-- write 'failed' status -->
-            <propertyfile file="${cc.execution.status.file}"
-                          comment="${cc.execution.status.file.header}.">
-                <entry key="${suite.name}.parameters.run.failed" value="true"/>
-            </propertyfile>
         </catch>
         </trycatch>
         <echo file="${cc.execution.log.file}" append="true" 

Modified: harmony/enhanced/buildtest/trunk/infra/scripts/framework.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/scripts/framework.properties?rev=651557&r1=651556&r2=651557&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/scripts/framework.properties (original)
+++ harmony/enhanced/buildtest/trunk/infra/scripts/framework.properties Fri Apr 25 03:06:34
2008
@@ -12,8 +12,6 @@
 cc.project.template=${scripts.dir}/templates/cc-project-template.xml
 cc.log.dir=${cc.work.dir}/logs
 cc.project.execution.timeout=5000000
-cc.execution.status.file=${cc.work.dir}/execution.status
-cc.execution.status.file.header=\ Autogenerated file used for Test Suites execution status
checking.
 cc.execution.log.file=${cc.work.dir}/execution_log.html
 
 external.libs.dir=${build.dir}/libs

Modified: harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml?rev=651557&r1=651556&r2=651557&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/scripts/framework.xml Fri Apr 25 03:06:34 2008
@@ -133,35 +133,6 @@
         </sequential>
     </macrodef>
 
-    <!-- check for the failures of the superior suites and place their
-         names (if any) into specified property -->
-    <macrodef name="check-superior-failures">
-        <attribute name="suite"/>
-        <attribute name="check-target"/>
-        <attribute name="property" default="@{suite}.has.failed.superior"/>
-        <sequential>
-            <var name="@{property}" unset="true"/>
-
-            <for list="${@{suite}.parameters.depends}" param="superior">
-            <sequential>
-                <log message="Check for '@{check-target}' failure of @{superior} = ${@{superior}.parameters.@{check-target}.failed}"/>
-                <if>
-                    <or>
-                        <istrue value="${@{superior}.parameters.@{check-target}.failed}"/>
-                        <istrue value="${@{superior}.parameters.@{check-target}.skipped}"/>
-                    </or>
-                <then>
-                    <!-- empty value as initial -->
-                    <property name="@{property}" value=""/>
-                    <var name="@{property}" value="${@{property}}@{superior} "/>
-                </then>
-                </if>
-            </sequential>
-            </for>
-            <log message="Result: @{property} = '${@{property}}'"/>
-        </sequential>
-    </macrodef>
-
     <!-- removes svn locks leaved after unsuccessful checkout or update-->
     <macrodef name="svn-cleanup">
         <attribute name="trunk"/>



Mime
View raw message