harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r532682 - in /harmony/enhanced/buildtest/branches/2.0: adaptors/classlib/adaptor.xml adaptors/drlvm/adaptor.xml build.xml scripts/adaptor-interface.xml scripts/exec-adaptor.xml scripts/framework.xml
Date Thu, 26 Apr 2007 09:41:10 GMT
Author: smishura
Date: Thu Apr 26 02:41:09 2007
New Revision: 532682

URL: http://svn.apache.org/viewvc?view=rev&rev=532682
Log:
Apply patch that adds clean implementation.
See HARMONY-3501 (BT Infra Improvement)

Added:
    harmony/enhanced/buildtest/branches/2.0/scripts/adaptor-interface.xml   (with props)
Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/classlib/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm/adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/build.xml
    harmony/enhanced/buildtest/branches/2.0/scripts/exec-adaptor.xml
    harmony/enhanced/buildtest/branches/2.0/scripts/framework.xml

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/classlib/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/classlib/adaptor.xml?view=diff&rev=532682&r1=532681&r2=532682
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/classlib/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/classlib/adaptor.xml Thu Apr 26 02:41:09
2007
@@ -55,6 +55,13 @@
         </exec>
     </target>
 
+    <target name="clean" depends="-set-properties">
+        <ant target="clean" 
+             dir="${trunk.dir}" 
+             inheritAll="false">
+        </ant>
+    </target>
+
     <target name="-set-properties" depends="-set-properties-win, -set-properties-other"/>
 
     <condition property="is.windows">
@@ -71,12 +78,6 @@
         <property name="sh" value="sh"/>
         <property name="cmd.prefix" value=""/>
         <property name="cmd" value='"${ant.home}/bin/ant"'/>
-    </target>
-
-    <target name="clean">
-        <description>
-            to do clean
-        </description>
     </target>
 
 </project>

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm/adaptor.xml?view=diff&rev=532682&r1=532681&r2=532682
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/drlvm/adaptor.xml Thu Apr 26 02:41:09
2007
@@ -65,10 +65,15 @@
         </exec>
     </target>
 
-    <target name="clean">
-        <description>
-            to do clean
-        </description>
+    <target name="clean" depends="-set-properties">
+        <exec executable="${sh}" dir="${trunk.dir}/build" failonerror="true">
+            <arg line="${cmd.prefix} ${cmd}"/>
+            <arg line="-Dproxy.host.vm=${http.proxyHost} -Dproxy.port.vm=${http.proxyPort}"/>
+            <arg line="-Ddeploy.canonical.flag=true"/>
+            <arg line="-Dbuild.cfg=release"/>
+            <arg line="-Dexternal.dep.CLASSLIB.loc=${classlib.trunk}"/>
+            <arg line="clean" />
+        </exec>
     </target>
 
     <!-- platform depending configuration properties -->

Modified: harmony/enhanced/buildtest/branches/2.0/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/build.xml?view=diff&rev=532682&r1=532681&r2=532682
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/build.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/build.xml Thu Apr 26 02:41:09 2007
@@ -131,9 +131,7 @@
         </java>
     </target>
 
-    <target name="clean" description="clean" depends="init-framework">
-        <antfetch dir="scripts" target="distclean" antfile="../build.xml"/>
-    </target>
+    <target name="clean" description="clean" depends="init-framework, clean-suites"/>
 
     <target name="distclean" description="distclean">
     </target>

Added: harmony/enhanced/buildtest/branches/2.0/scripts/adaptor-interface.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/scripts/adaptor-interface.xml?view=auto&rev=532682
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/adaptor-interface.xml (added)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/adaptor-interface.xml Thu Apr 26 02:41:09
2007
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+     
+         http://www.apache.org/licenses/LICENSE-2.0
+     
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License. -->
+
+<!DOCTYPE buildtest SYSTEM "../buildtest.dtd">
+
+<!-- ====================================================================== 
+           Contains default implementations of the Adaptor's targets
+     ====================================================================== -->
+<project name="adaptor-interface" basedir=".">
+
+    <!-- Default clean target implementation. -->
+    <target name="clean">
+        <echo>
+--------
+WARNING: The adaptor.xml for '${suite.name}' Test Suite does not implement
+-------- the clean target. Default implementation does nothing...
+</echo>
+    </target>
+
+</project>
+

Propchange: harmony/enhanced/buildtest/branches/2.0/scripts/adaptor-interface.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/buildtest/branches/2.0/scripts/exec-adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/scripts/exec-adaptor.xml?view=diff&rev=532682&r1=532681&r2=532682
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/exec-adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/exec-adaptor.xml Thu Apr 26 02:41:09 2007
@@ -25,6 +25,9 @@
     <import file="${framework.implementation.file}"/>
     <import file="${adaptors.dir}/${suite.name}/adaptor.xml"/>
 
+    <!-- import default inmlementations of the adaptor interface -->
+    <import file="${scripts.dir}/adaptor-interface.xml"/>
+
     <!-- calls the adaptor's target specified by 
          '@{target}' attribute value.
          Supposed parameters:
@@ -64,6 +67,10 @@
 
     <target name="run-suite">
         <call-target target="run"/>
+    </target>
+
+    <target name="clean-suite">
+        <call-target target="clean"/>
     </target>
 
     <!-- just load all defined parameters -->

Modified: harmony/enhanced/buildtest/branches/2.0/scripts/framework.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/scripts/framework.xml?view=diff&rev=532682&r1=532681&r2=532682
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/scripts/framework.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/scripts/framework.xml Thu Apr 26 02:41:09 2007
@@ -497,6 +497,20 @@
         <antcall target="check-status"/>
     </target>
 
+    <!-- Clean the suites -->
+    <target name="clean-suites" depends="define-tasks">
+        <!-- load suites properties -->
+        <for list="${test.suites.names.list}" param="suite">
+        <sequential>
+            <echo>===========================================</echo>
+            <log message="Cleaning of '@{suite}' Test Suite.."/>
+            <call-to-adaptor suite="@{suite}" call="clean-suite"/>
+        </sequential>
+        </for>
+        <antcall target="check-status"/>
+    </target>
+
+
     <macrodef name="call-to-adaptor">
         <attribute name="suite"/>
         <attribute name="call"/>



Mime
View raw message