Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@harmony.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r548633 - in
 /harmony/enhanced/buildtest/branches/2.0/tests/functional: ./
 src/test/functional/org/apache/harmony/test/func/jit/HLO/
 src/test/functional/org/apache/harmony/test/func/reg/
 src/test/functional/org/apache/harmony/test/func/reg/...
Date: Tue, 19 Jun 2007 07:48:45 -0000
To: commits@harmony.apache.org
From: ivavladimir@apache.org
Message-Id: <20070619074846.6F1C31A981A@eris.apache.org>

Author: ivavladimir
Date: Tue Jun 19 00:48:43 2007
New Revision: 548633

URL: http://svn.apache.org/viewvc?view=rev&rev=548633
Log:
update for functional test suite

Added:
    harmony/enhanced/buildtest/branches/2.0/tests/functional/build-native.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jit/HLO/build.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/build.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/build.xml
Modified:
    harmony/enhanced/buildtest/branches/2.0/tests/functional/build.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/vm/btest5440/Btest5440.java
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/vm/btest5542/Btest5542.java
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/vm/btest6158/Btest6158.java
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/agentpath/agentpath01/agentpath01.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/agentpath/agentpath02/agentpath02.xml
    harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/agentpath/agentpath03/agentpath03.xml

Added: harmony/enhanced/buildtest/branches/2.0/tests/functional/build-native.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/build-native.xml?view=auto&rev=548633
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/build-native.xml (added)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/build-native.xml Tue Jun 19 00:48:43 2007
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+
+<project name="QA-func-build_native" default="build.native">
+    <description>
+        Functional test suite - build native part
+    </description>
+
+    <property environment="env"/>
+
+    <property name="cpptasks.jar"      location="${depends}/cpptasks-1.0b3.jar" />
+    <property name="test.java.include" location="${env.JAVA_HOME}/include" />
+    <property name="bin.lib"           location="${bin}/lib" />
+    <property name="bin.obj.dir"       location="${bin.lib}/obj" />
+
+    <property name="compiler.win" value="msvc" />
+    <property name="compiler.linux" value="gcc" />
+    <condition property="compiler" value="${compiler.win}" else="${compiler.linux}">
+        <os family="windows" />
+    </condition>
+    <condition property="test.java.include.OS" value="${test.java.include}/win32" 
+                                                else="${test.java.include}/linux">
+        <os family="windows" />
+    </condition>
+
+    <target name="build.native" depends="depends-check-cpptasks">           
+        <mkdir dir="${bin.obj.dir}" />
+
+        <taskdef resource="cpptasks.tasks">
+            <classpath>
+                <pathelement location="${cpptasks.jar}"/>
+            </classpath>
+        </taskdef>
+        <typedef resource="cpptasks.types">
+            <classpath>
+                <pathelement location="${cpptasks.jar}"/>
+            </classpath>
+        </typedef>
+
+        <subant target="post_build" inheritall="false" >
+            <property name="compiler" value="${compiler}"/>
+            <property name="bin.lib" value="${bin.lib}"/>
+            <property name="bin.obj.dir" value="${bin.obj.dir}"/>
+            <property name="test.java.include" value="${test.java.include}"/>
+            <property name="test.java.include.OS" value="${test.java.include.OS}"/>
+            <dirset dir="${src.test}/functional/org/apache/harmony/test/func" >
+                <include name="reg"/>
+                <include name="jit/HLO"/>
+                <include name="vm/cli"/>
+            </dirset>
+        </subant>
+    </target>
+
+    <!-- check that external tools and libs are in depends/ dir -->
+    <target name="depends-check-cpptasks">
+        <fail>
+          <condition>
+              <not>
+                <available file="${cpptasks.jar}" type="file"/>
+              </not>
+          </condition>
+ERROR: Can not find cpptasks : '${cpptasks.jar}'
+        </fail>
+
+    </target>
+
+    <!-- macro for use in tests' build.xml definitions -->
+    <macrodef name="c-compile">
+        <attribute name="library.name"/>
+        <attribute name="src.dir"/>
+        <element name="cc-elements" implicit="true" optional="true"/>
+        <sequential>
+            <cc name="${compiler}"
+                outfile="${bin.lib}/@{library.name}"
+                objdir="${bin.obj.dir}"
+                outtype="shared">
+
+                <includepath path="@{src.dir}" />
+                <includepath path="${test.java.include}" />
+                <includepath path="${test.java.include.OS}" />
+                <fileset dir="@{src.dir}">
+                    <include name="**/*.c" />
+                    <include name="**/*.cpp" />
+                </fileset>
+
+                <cc-elements />
+            </cc>
+        </sequential>
+    </macrodef>
+
+</project>
+

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/build.xml?view=diff&rev=548633&r1=548632&r2=548633
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/build.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/build.xml Tue Jun 19 00:48:43 2007
@@ -53,11 +53,13 @@
 	
 	<target name="build-n-run" depends="build,run-tests" />
 
-	<target name="build" depends="compile_jpda,compile_java,compile_ccode,post_compile">
+	<target name="build" depends="compile_jpda,compile_java,compile_ccode,build.native,post_compile">
 		<description>
 			Prepare binaries for test run
 		</description>
 	</target>
+
+    <import file="build-native.xml"/>
 
     <!-- Build test classes from jasmine sources -->
 	<target name="compile_jj" depends="depends-check" >

Added: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jit/HLO/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jit/HLO/build.xml?view=auto&rev=548633
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jit/HLO/build.xml (added)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/jit/HLO/build.xml Tue Jun 19 00:48:43 2007
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+
+<project name="QA-func-build_native_HLO" default="post_build">
+
+    <target name="post_build" > 
+        <echo message="Basedir = ${basedir}" />
+        <c-compile library.name="dcetest"     src.dir="dce/deadnative" />
+        <c-compile library.name="branch"      src.dir="hvn/Branch" />
+        <c-compile library.name="lazyexcTest" src.dir="lazyexc/ChangeField4" />
+        <c-compile library.name="peelTest"    src.dir="peel/Native" />
+        <c-compile library.name="constPropagation" src.dir="simplify/constPropagation/Propagate1" />
+        <c-compile library.name="copyPropagation"  src.dir="simplify/copyPropagation/Propagate1" />
+
+    </target>
+</project>
+

Added: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/build.xml?view=auto&rev=548633
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/build.xml (added)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/build.xml Tue Jun 19 00:48:43 2007
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+
+<project name="QA-func-build_native_reg" default="post_build">
+
+    <target name="post_build" > 
+        <echo message="Basedir = ${basedir}" />
+        <c-compile library.name="Btest1485" src.dir="vm/btest1485" />
+        <c-compile library.name="Btest2539" src.dir="vm/btest2539" />
+        <c-compile library.name="Btest3010" src.dir="vm/btest3010" />
+        <c-compile library.name="Btest4673" src.dir="vm/btest4673" />
+        <c-compile library.name="Btest5097" src.dir="vm/btest5097" />
+        <c-compile library.name="Btest5118" src.dir="vm/btest5118" />
+        <c-compile library.name="Btest5217" src.dir="vm/btest5217" />
+        <c-compile library.name="Btest5440" src.dir="vm/btest5440" />
+        <c-compile library.name="Btest5542" src.dir="vm/btest5542" />
+        <c-compile library.name="Btest5590" src.dir="vm/btest5590" />
+        <c-compile library.name="Btest5615" src.dir="vm/btest5615" />
+        <c-compile library.name="Btest5940" src.dir="vm/btest5940" />
+        <c-compile library.name="Btest6080" src.dir="vm/btest6080" />
+        <c-compile library.name="Btest6158" src.dir="vm/btest6158" />
+        <c-compile library.name="Btest6205" src.dir="vm/btest6205" />
+        <c-compile library.name="Btest6353" src.dir="vm/btest6353" />
+        <c-compile library.name="Btest6486" src.dir="vm/btest6486" />
+        <c-compile library.name="Btest6819" src.dir="vm/btest6819" />
+        <c-compile library.name="Btest6954" src.dir="vm/btest6954" />
+        <c-compile library.name="Btest7006" src.dir="vm/btest7006" />
+        <c-compile library.name="Btest7108" src.dir="vm/btest7108" />
+        <c-compile library.name="Btest7157" src.dir="vm/btest7157" />
+        <c-compile library.name="Btest7394" src.dir="vm/btest7394" />
+        <c-compile library.name="Btest7414" src.dir="vm/btest7414" />
+        <c-compile library.name="Btest7494" src.dir="vm/btest7494" />
+        <c-compile library.name="Btest7579" src.dir="vm/btest7579" />
+        <c-compile library.name="Btest10305" src.dir="vm/btest10305" />
+    </target>
+</project>
+

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/vm/btest5440/Btest5440.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/vm/btest5440/Btest5440.java?view=diff&rev=548633&r1=548632&r2=548633
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/vm/btest5440/Btest5440.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/vm/btest5440/Btest5440.java Tue Jun 19 00:48:43 2007
@@ -25,7 +25,7 @@
     private static final int MAX_STR_COUNT = 100000;
     
     static {
-        System.loadLibrary("bug5440");
+        System.loadLibrary("Btest5440");
     }  
 
     public static void main(String [] args) {

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/vm/btest5542/Btest5542.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/vm/btest5542/Btest5542.java?view=diff&rev=548633&r1=548632&r2=548633
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/vm/btest5542/Btest5542.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/vm/btest5542/Btest5542.java Tue Jun 19 00:48:43 2007
@@ -22,7 +22,7 @@
 public class Btest5542 extends Thread {
     
     static {
-        System.loadLibrary("bug5542");
+        System.loadLibrary("Btest5542");
     }           
 
     public static void main(String[] args) {

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/vm/btest6158/Btest6158.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/vm/btest6158/Btest6158.java?view=diff&rev=548633&r1=548632&r2=548633
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/vm/btest6158/Btest6158.java (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/reg/vm/btest6158/Btest6158.java Tue Jun 19 00:48:43 2007
@@ -28,7 +28,7 @@
 
     public int test(Logger logger, String[] args) {
         try {
-            System.loadLibrary("nativeMethod");
+            System.loadLibrary("Btest6158");
             Class c = Class.forName("org.apache.harmony.test.func.reg.vm.btest6158.Btest6158");
             Method m = c.getDeclaredMethod("nativeFunc", new Class[]{Object.class });
             m.setAccessible(true);

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/agentpath/agentpath01/agentpath01.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/agentpath/agentpath01/agentpath01.xml?view=diff&rev=548633&r1=548632&r2=548633
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/agentpath/agentpath01/agentpath01.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/agentpath/agentpath01/agentpath01.xml Tue Jun 19 00:48:43 2007
@@ -30,7 +30,7 @@
         <Modification date="2005-09-23" />
         <Runner ID="Execute">       
             <Param name="toRun" value="$TestedRuntime">
-                <Option name="-agentpath:$TestSuiteRoot$FileSeparatorbin$FileSeparatorlib$FileSeparatortestlib.dll"/>
+                <Option name="-agentpath:$TestSuiteLibRoot${FileSeparator}testlib.dll"/>
                 <Option name="-classpath" value="$CP"/>
                 <Option name="CommonTest"/>
             </Param>        

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/agentpath/agentpath02/agentpath02.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/agentpath/agentpath02/agentpath02.xml?view=diff&rev=548633&r1=548632&r2=548633
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/agentpath/agentpath02/agentpath02.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/agentpath/agentpath02/agentpath02.xml Tue Jun 19 00:48:43 2007
@@ -30,7 +30,7 @@
         <Modification date="2005-09-23" />
         <Runner ID="ExecuteNegative">       
             <Param name="toRun" value="$TestedRuntime">
-                <Option name="-agentpath:$TestSuiteRoot$FileSeparatorbin$FileSeparatorlib$FileSeparatornotestlib.dll"/>
+                <Option name="-agentpath:$TestSuiteLibRoot${FileSeparator}notestlib.dll"/>
                 <Option name="-classpath" value="$CP"/>
                 <Option name="CommonTest"/>
             </Param>        

Modified: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/agentpath/agentpath03/agentpath03.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/agentpath/agentpath03/agentpath03.xml?view=diff&rev=548633&r1=548632&r2=548633
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/agentpath/agentpath03/agentpath03.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/agentpath/agentpath03/agentpath03.xml Tue Jun 19 00:48:43 2007
@@ -30,7 +30,7 @@
         <Modification date="2005-09-23" />
         <Runner ID="Execute">       
             <Param name="toRun" value="$TestedRuntime">
-                <Option name="-agentpath:$TestSuiteRoot$FileSeparatorbin$FileSeparatorlib$FileSeparatortestlib.dll=opt1,opt2"/>
+                <Option name="-agentpath:$TestSuiteLibRoot${FileSeparator}testlib.dll=opt1,opt2"/>
                 <Option name="-classpath" value="$CP"/>
                 <Option name="CommonTest"/>
             </Param>        

Added: harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/build.xml?view=auto&rev=548633
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/build.xml (added)
+++ harmony/enhanced/buildtest/branches/2.0/tests/functional/src/test/functional/org/apache/harmony/test/func/vm/cli/build.xml Tue Jun 19 00:48:43 2007
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    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.
+-->
+
+<project name="QA-func-build_native_HLO" default="post_build">
+
+    <target name="post_build" > 
+        <echo message="Basedir = ${basedir}" />
+        <c-compile library.name="testlib"     src.dir="share" />
+    </target>
+</project>
+