harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r650425 - in /harmony/enhanced/buildtest/trunk/infra/adaptors: classlib-test/adaptor.xml drlvm-reg-test/adaptor.xml drlvm-test/adaptor.xml drlvm/adaptor.xml
Date Tue, 22 Apr 2008 09:04:37 GMT
Author: smishura
Date: Tue Apr 22 02:04:28 2008
New Revision: 650425

URL: http://svn.apache.org/viewvc?rev=650425&view=rev
Log:
Formatting

Modified:
    harmony/enhanced/buildtest/trunk/infra/adaptors/classlib-test/adaptor.xml
    harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-reg-test/adaptor.xml
    harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-test/adaptor.xml
    harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm/adaptor.xml

Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/classlib-test/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/classlib-test/adaptor.xml?rev=650425&r1=650424&r2=650425&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/classlib-test/adaptor.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/classlib-test/adaptor.xml Tue Apr 22 02:04:28
2008
@@ -9,11 +9,11 @@
      
          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. -->
+    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. -->
 
 <!-- ====================================================================== 
                     BT Adaptor Executing CLASSLIB Unit Tests
@@ -21,26 +21,27 @@
 <project name="classlib-test" default="run" basedir=".">
 
     <property name="classlib-test.results.dir"
-              value="${results.dir}/${suite.name}"/>
+              value="${results.dir}/${suite.name}" />
 
     <!-- the default value for JRE options -->
-    <property name="jre.options" value="-showversion"/>
+    <property name="jre.options" value="-showversion" />
 
     <!-- do setup -->
     <target name="setup">
-        <mkdir dir="${classlib-test.results.dir}"/>
+        <mkdir dir="${classlib-test.results.dir}" />
     </target>
 
     <!-- do run -->
     <target name="run" depends="-update-classlib-ws">
         <!-- remove old results (they have been archived after the run) -->
         <delete quiet="true" verbose="false">
-            <fileset dir="${classlib-test.results.dir}" includes="**/*"/>
+            <fileset dir="${classlib-test.results.dir}" includes="**/*" />
         </delete>
 
         <!-- Do clean first (even before fetch-depends) -->
         <!-- to remove previous results                 -->
-        <ant antfile="make/build-test.xml" target="clean"
+        <ant antfile="make/build-test.xml"
+             target="clean"
              dir="${classlib-test.parameters.required.trunk.dir}"
              inheritAll="false" />
 
@@ -59,19 +60,16 @@
                   targets="test"
                   failonerror="false"
                   failproperty="classlib-test.run.failed">
-            <jvmarg line="-Xmx800M"/>
+            <jvmarg line="-Xmx800M" />
             <sysproperty key="test.jre.home"
-                            value="${classlib-test.tested.jre}"/>
-            <sysproperty key="tested.jre.options"
-                            value="${jre.options}"/>
-            <sysproperty key="exclude.interm"
-                            value="true"/>
-            <sysproperty key="exclude.module"
-                            value="awt,swing"/>
+                         value="${classlib-test.tested.jre}" />
+            <sysproperty key="tested.jre.options" value="${jre.options}" />
+            <sysproperty key="exclude.interm" value="true" />
+            <sysproperty key="exclude.module" value="awt,swing" />
         </exec-ant>
 
         <fail message="There were CLASSLIB Unit Test failures."
-              if="classlib-test.run.failed"/>
+              if="classlib-test.run.failed" />
     </target>
 
     <!--                                                    -->

Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-reg-test/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-reg-test/adaptor.xml?rev=650425&r1=650424&r2=650425&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-reg-test/adaptor.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-reg-test/adaptor.xml Tue Apr 22
02:04:28 2008
@@ -9,42 +9,46 @@
      
          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. -->
+    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. -->
 
 <!-- ====================================================================== 
               BT Adaptor Executing Harmony DRLVM Regression Tests
      ====================================================================== -->
 <project name="drlvm-reg-test" default="run" basedir=".">
 
-    <property name="drlvm-reg-test.results.dir" value="${results.dir}/${suite.name}"/>
+    <property name="drlvm-reg-test.results.dir"
+              value="${results.dir}/${suite.name}" />
 
     <target name="setup">
-        <mkdir dir="${results.dir}/${suite.name}"/>
+        <mkdir dir="${results.dir}/${suite.name}" />
     </target>
-    
+
     <target name="run" depends="-update">
         <!-- remove old results (they should be archived after the run) -->
         <delete quiet="true" verbose="false">
-            <fileset dir="${drlvm-reg-test.results.dir}" includes="**/*"/>
+            <fileset dir="${drlvm-reg-test.results.dir}" includes="**/*" />
         </delete>
 
         <!-- launch the tests -->
-        <exec-ant dir="${built.drlvm.trunk}" targets="reg.test" 
-            failonerror="false" failproperty="drlvm-reg-test.run.failed">
-            <sysproperty key="hy.cfg" value="${drlvm.config}"/>
-            <sysproperty key="common.resources.loc" value="${common.resources}"/>
-            <arg line="${tested.hdk.param}"/>
+        <exec-ant dir="${built.drlvm.trunk}"
+                  targets="reg.test"
+                  failonerror="false"
+                  failproperty="drlvm-reg-test.run.failed">
+            <sysproperty key="hy.cfg" value="${drlvm.config}" />
+            <sysproperty key="common.resources.loc"
+                         value="${common.resources}" />
+            <arg line="${tested.hdk.param}" />
         </exec-ant>
 
-        <fail message="There were drlvm-reg-test failures" 
-              if="drlvm-reg-test.run.failed"/>
+        <fail message="There were drlvm-reg-test failures"
+              if="drlvm-reg-test.run.failed" />
     </target>
-    
-    
+
+
     <!--                                                    -->
     <!-- Targets and properties related to snapshot testing -->
     <!--                                                    -->
@@ -53,13 +57,16 @@
                 arg2="snapshot"
                 trim="yes" />
     </condition>
-    
-    <condition property="tested.hdk.param" value="-Dtest.hdk.home=${snapshot.parameters.shared.hdk}"
else="">
-        <isset property="is.snapshot"/>
+
+    <condition property="tested.hdk.param"
+               value="-Dtest.hdk.home=${snapshot.parameters.shared.hdk}"
+               else="">
+        <isset property="is.snapshot" />
     </condition>
 
-    <target name="-update" if="is.snapshot" 
-        description="adjusts tests to snapshot revision">
+    <target name="-update"
+            if="is.snapshot"
+            description="adjusts tests to snapshot revision">
         <mkdir dir="${built.drlvm.trunk}" />
         <mkdir dir="${common.resources}" />
         <loadproperties srcFile="${snapshot.svn.revision.file}" />
@@ -70,12 +77,14 @@
             <arg line="co -r${svn.revision} ${drlvm.trunk.url} ." />
         </exec>
 
-        <exec-ant dir="${built.drlvm.trunk}" targets="clean fetch-depends"
+        <exec-ant dir="${built.drlvm.trunk}"
+                  targets="clean fetch-depends"
                   failonerror="true">
-            <sysproperty key="hy.cfg" value="${drlvm.config}"/>
-            <sysproperty key="common.resources.loc" value="${common.resources}"/>
+            <sysproperty key="hy.cfg" value="${drlvm.config}" />
+            <sysproperty key="common.resources.loc"
+                         value="${common.resources}" />
         </exec-ant>
-                    
+
     </target>
 
 </project>

Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-test/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-test/adaptor.xml?rev=650425&r1=650424&r2=650425&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-test/adaptor.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm-test/adaptor.xml Tue Apr 22 02:04:28
2008
@@ -9,44 +9,48 @@
      
          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. -->
+    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. -->
 
 <!-- ====================================================================== 
                     BT Adaptor Executing Harmony DRLVM Tests
      ====================================================================== -->
 <project name="drlvm-test" default="run" basedir=".">
 
-    <property name="drlvm-test.results.dir" value="${results.dir}/${suite.name}"/>
+    <property name="drlvm-test.results.dir"
+              value="${results.dir}/${suite.name}" />
 
     <target name="setup">
-        <mkdir dir="${results.dir}/${suite.name}"/>
+        <mkdir dir="${results.dir}/${suite.name}" />
     </target>
-    
+
     <target name="run" depends="-update">
         <!-- remove old results (they should be archived after the run) -->
         <delete quiet="true" verbose="false">
-            <fileset dir="${drlvm-test.results.dir}" includes="**/*"/>
+            <fileset dir="${drlvm-test.results.dir}" includes="**/*" />
         </delete>
 
         <!-- launch the tests kernel.test -->
-        <exec-ant dir="${built.drlvm.trunk}" targets="test"
-                  failonerror="false" failproperty="drlvm-test.run.failed">
-            <sysproperty key="hy.cfg" value="${drlvm.config}"/>
-            <sysproperty key="common.resources.loc" value="${common.resources}"/>
-            <sysproperty key="test.mode" 
-                         value="${drlvm-test.parameters.optional.test.mode}"/>
+        <exec-ant dir="${built.drlvm.trunk}"
+                  targets="test"
+                  failonerror="false"
+                  failproperty="drlvm-test.run.failed">
+            <sysproperty key="hy.cfg" value="${drlvm.config}" />
+            <sysproperty key="common.resources.loc"
+                         value="${common.resources}" />
+            <sysproperty key="test.mode"
+                         value="${drlvm-test.parameters.optional.test.mode}" />
             <sysproperty key="run.all.tests" value="true" />
-            <arg line="${tested.hdk.param}"/>
+            <arg line="${tested.hdk.param}" />
         </exec-ant>
 
-        <fail message="There were drlvm-test failures" 
-              if="drlvm-test.run.failed"/>
+        <fail message="There were drlvm-test failures"
+              if="drlvm-test.run.failed" />
     </target>
-    
+
     <!--                                                    -->
     <!-- Targets and properties related to snapshot testing -->
     <!--                                                    -->
@@ -55,13 +59,16 @@
                 arg2="snapshot"
                 trim="yes" />
     </condition>
-    
-    <condition property="tested.hdk.param" value="-Dtest.hdk.home=${snapshot.parameters.shared.hdk}"
else="">
-        <isset property="is.snapshot"/>
+
+    <condition property="tested.hdk.param"
+               value="-Dtest.hdk.home=${snapshot.parameters.shared.hdk}"
+               else="">
+        <isset property="is.snapshot" />
     </condition>
 
-    <target name="-update" if="is.snapshot" 
-        description="adjusts tests to snapshot revision">
+    <target name="-update"
+            if="is.snapshot"
+            description="adjusts tests to snapshot revision">
         <mkdir dir="${built.drlvm.trunk}" />
         <mkdir dir="${common.resources}" />
         <loadproperties srcFile="${snapshot.svn.revision.file}" />
@@ -72,10 +79,12 @@
             <arg line="co -r${svn.revision} ${drlvm.trunk.url} ." />
         </exec>
 
-        <exec-ant dir="${built.drlvm.trunk}" targets="clean fetch-depends"
+        <exec-ant dir="${built.drlvm.trunk}"
+                  targets="clean fetch-depends"
                   failonerror="true">
-            <sysproperty key="hy.cfg" value="${drlvm.config}"/>
-            <sysproperty key="common.resources.loc" value="${common.resources}"/>
+            <sysproperty key="hy.cfg" value="${drlvm.config}" />
+            <sysproperty key="common.resources.loc"
+                         value="${common.resources}" />
         </exec-ant>
     </target>
 

Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm/adaptor.xml?rev=650425&r1=650424&r2=650425&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm/adaptor.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/drlvm/adaptor.xml Tue Apr 22 02:04:28
2008
@@ -9,11 +9,11 @@
      
          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. -->
+    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. -->
 
 <!-- ====================================================================== 
                     BT Adaptor for Harmony DRLVM Project
@@ -22,35 +22,36 @@
 
     <!-- define build configuration, 
          used in parameters.xml for assignment the value to shared parameter -->
-    <property name="build.config" 
-              value="${drlvm.parameters.optional.build.cfg}"/>
-    
-    <property name="common.resources" 
-              value="${checkouts.dir}/common_resources"/>
+    <property name="build.config"
+              value="${drlvm.parameters.optional.build.cfg}" />
+
+    <property name="common.resources"
+              value="${checkouts.dir}/common_resources" />
 
     <target name="setup" />
 
-    <target name="run" description="Verifies integrity of the DRLVM trunk"> 
+    <target name="run" description="Verifies integrity of the DRLVM trunk">
         <exec executable="svn" dir="${common.resources}" failonerror="true">
             <arg line="update" />
         </exec>
-        <drlvm-build targets="fetch-depends rebuild"/>
+        <drlvm-build targets="fetch-depends rebuild" />
     </target>
 
     <target name="clean">
-        <drlvm-build targets="clean"/>
+        <drlvm-build targets="clean" />
     </target>
 
     <macrodef name="drlvm-build">
-        <attribute name="targets"/>
+        <attribute name="targets" />
         <sequential>
             <!-- Use BTI staff to execute Ant Build in new process -->
             <exec-ant dir="${trunk.dir}" targets="@{targets}">
-                <sysproperty key="deploy.canonical.flag" value="true"/>
-                <sysproperty key="hy.cfg" value="${build.config}"/>
+                <sysproperty key="deploy.canonical.flag" value="true" />
+                <sysproperty key="hy.cfg" value="${build.config}" />
                 <sysproperty key="external.dep.CLASSLIB.loc"
-                             value='${classlib.trunk}'/>
-                <sysproperty key="common.resources.loc" value="${common.resources}"/>
+                             value='${classlib.trunk}' />
+                <sysproperty key="common.resources.loc"
+                             value="${common.resources}" />
             </exec-ant>
         </sequential>
     </macrodef>



Mime
View raw message