harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r795543 - in /harmony/enhanced/classlib/trunk/modules/x-net: build.xml make/run-test.xml
Date Sun, 19 Jul 2009 13:53:28 GMT
Author: hindessm
Date: Sun Jul 19 13:53:28 2009
New Revision: 795543

URL: http://svn.apache.org/viewvc?rev=795543&view=rev
Log:
Run x-net tests using hdk.

Added:
    harmony/enhanced/classlib/trunk/modules/x-net/make/run-test.xml   (with props)
Modified:
    harmony/enhanced/classlib/trunk/modules/x-net/build.xml

Modified: harmony/enhanced/classlib/trunk/modules/x-net/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/build.xml?rev=795543&r1=795542&r2=795543&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/x-net/build.xml Sun Jul 19 13:53:28 2009
@@ -43,6 +43,9 @@
     <property file="../../make/depends.properties" />
 
     <property name="tests.hdk.dir" value="${hy.hdk}/build/test/x-net" />
+    <property name="tests.excludes.hdk.dir" value="${tests.hdk.dir}/excludes" />
+    <property name="tests.resources.hdk.dir"
+              value="${tests.hdk.dir}/resources" />
     <property name="x-net.exclude.file"
               location="${tests.hdk.dir}/test.exclude" />
 
@@ -60,11 +63,15 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="-test-module" depends="build, compile-tests, prepare-exclude, run-tests"
/>
+    <target name="-test-module" depends="build, run-tests" />
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/x-net.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/x-net-src.jar" />
+        <delete file="${tests.hdk.dir}/x-net_test_support.jar" />
+        <delete file="${tests.hdk.dir}/x-net_api_tests.jar" />
+        <delete file="${tests.hdk.dir}/x-net_impl_tests.jar" />
+        <delete file="${tests.hdk.dir}/x-net_impl_boot_tests.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -126,10 +133,63 @@
         </jar>
     </target>
 
+    <target name="test-jar" depends="svn-info,compile-tests">
+        <mkdir dir="${tests.hdk.dir}" />
+
+        <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
+
+        <jar destfile="${tests.hdk.dir}/x-net_test_support.jar">
+            <fileset dir="bin/test/support" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+            <metainf refid="hy.required.metainf-files"/>
+        </jar>
+
+        <jar destfile="${tests.hdk.dir}/x-net_api_tests.jar">
+            <fileset dir="bin/test/api" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+            <metainf refid="hy.required.metainf-files"/>
+        </jar>
+
+        <jar destfile="${tests.hdk.dir}/x-net_impl_boot_tests.jar">
+            <fileset dir="bin/test/impl.injected" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+            <metainf refid="hy.required.metainf-files"/>
+        </jar>
+        <jar destfile="${tests.hdk.dir}/x-net_impl_tests.jar">
+            <fileset dir="bin/test/impl" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+            <metainf refid="hy.required.metainf-files"/>
+        </jar>
+
+        <mkdir dir="${tests.excludes.hdk.dir}" />
+        <copy todir="${tests.excludes.hdk.dir}">
+            <fileset dir="make" includes="exclude*"/>
+            <filterchain>
+                <tokenfilter>
+                    <replaceregex pattern="\.java" replace="\.class" flags="g"/>
+                </tokenfilter>
+            </filterchain>
+        </copy>
+
+        <copy todir="${tests.resources.hdk.dir}">
+            <fileset dir="src/test/resources" />
+        </copy>
+
+        <copy file="../../${junit.jar}" todir="${hy.hdk}/build/test" />
+    </target>
+
     <target name="compile-tests">
 
         <compile-tests description="x-net test support files"
-                       destdir="../../build/tests">
+                       destdir="bin/test/support">
             <javac-elements>
                 <src>
                     <pathelement location="src/test/support/common/java" />
@@ -141,6 +201,7 @@
         
         <compile-tests description="x-net api tests" destdir="bin/test/api">
             <javac-elements>
+                <classpath location="bin/test/support" />
                 <src path="src/test/api/java"/>
                 <src path="src/test/java"/>
                 <include name="**/*Test.java" />
@@ -150,6 +211,7 @@
         <compile-tests description="x-net impl injected tests"
                        destdir="bin/test/impl.injected">
             <javac-elements>
+                <classpath location="bin/test/support" />
                 <src path="src/test/impl/java.injected"/>
                 <include name="**/*Test.java" />
             </javac-elements>
@@ -163,129 +225,8 @@
         </compile-tests>
     </target>
 
-    <target name="prepare-exclude">
-       <prepare-exclude-list moduleName="x-net" dir="./make"
-                             result="${x-net.exclude.file}"/>
-    </target>
-
-    <target name="run-tests" depends="run-tests-api, run-tests-impl" />
-
-    <target name="run-tests-api">
-
-        <run-tests description="api tests">
-            <junit-elements>
-
-                <classpath>
-                    <pathelement path="bin/test/api"/>
-                    <pathelement path="${hy.hdk}/build/test/support.jar" />
-                    <pathelement path="../../build/tests" />
-                </classpath>
-
-                <batchtest todir="${tests.output}" haltonfailure="no" >
-                    <fileset dir="src/test/api/java">
-                        <!-- if ${test.case}     -->
-                        <include name="${converted.tc}" if="test.case" />
-                        <!-- unless ${test.case} -->
-                        <include name="**/*Test.java" unless="test.case" />
-                        <excludesfile name="${x-net.exclude.file}" unless="test.case"
/>
-                    </fileset>
-                </batchtest>
-
-            </junit-elements>
-        </run-tests>
-
-        <antcall target="touch-failures-file" />
-        <antcall target="touch-errors-file" />
-    </target>
-
-    <target name="run-tests-impl" unless="test.noimpl">
-        <run-tests description="impl tests">
-            <junit-elements>
-                <classpath>
-                    <pathelement path="bin/test/impl"/>
-                    <pathelement path="${hy.hdk}/build/test/support.jar" />
-                </classpath>
-                
-                <batchtest todir="${tests.output}" haltonfailure="no" >
-                    <fileset dir="src/test/impl/java">
-                        <!-- if ${test.case}     -->
-                        <include name="${converted.tc}" if="test.case" />
-                        <!-- unless ${test.case} -->
-                        <include name="**/*Test.java" unless="test.case" />
-                        <excludesfile name="${x-net.exclude.file}" unless="test.case"
/>
-                    </fileset>
-                </batchtest>
-
-            </junit-elements>
-        </run-tests>
-        <run-tests description="impl injected tests">
-            <junit-elements>
-                <!-- to pick up junit.jar               -->
-                <jvmarg value="-Xbootclasspath/a:bin/test/impl.injected${path.separator}../../${junit.jar}${path.separator}../../build/tests${path.separator}${hy.hdk}/build/test/support.jar"/>
-
-                <batchtest todir="${tests.output}" haltonfailure="no" >
-                    <fileset dir="src/test/impl/java.injected">
-                        <!-- if ${test.case}     -->
-                        <include name="${converted.tc}" if="test.case" />
-                        <!-- unless ${test.case} -->
-                        <include name="**/*Test.java" unless="test.case" />
-                        <excludesfile name="${x-net.exclude.file}" unless="test.case"
/>
-                    </fileset>
-                </batchtest>
-
-            </junit-elements>
-        </run-tests>
-
-        <antcall target="touch-failures-file" />
-        <antcall target="touch-errors-file" />
-    </target>
-
-    <target name="touch-failures-file" if="test.failures">
-        <echo file="${tests.output}/test.failures"
-            append="true">x-net${line.separator}</echo>
-    </target>
-
-    <target name="touch-errors-file" if="test.errors">
-        <echo file="${tests.output}/test.errors"
-            append="true">x-net${line.separator}</echo>
-    </target>
-    
-    <macrodef name="run-tests">
-        <attribute name="description" default="" />
-        <element name="junit-elements" />
-        <sequential>
-            <echo message="Running X-NET @{description}" />
-
-            <mkdir dir="${tests.output}" />
-
-            <property name="test.jre.home" value="${hy.jdk}/jre" />
-
-            <junit fork="yes"
-                   forkmode="${hy.test.forkmode}"
-                   timeout="${hy.test.timeout}"
-                   printsummary="withOutAndErr"
-                   errorproperty="test.errors"
-                   failureproperty="test.failures"
-                   showoutput="on"
-                   dir="${basedir}"
-                   jvm="${test.jre.home}/bin/java">
-
-                <assertions enableSystemAssertions="true">
-                    <enable />
-                </assertions>
-
-                <jvmarg line="${hy.test.vmargs}" />
-
-                <junit-elements />
-
-                <classpath>
-                    <pathelement path="src/test/resources"/>
-                    <pathelement path="../../build/tests" />
-                </classpath>
-
-                <formatter type="xml" />
-            </junit>
-        </sequential>
-    </macrodef>
+    <target name="run-tests" depends="test-jar">
+        <ant dir="${tests.hdk.dir}" target="test-module" />
+    </target>
 
 </project>

Added: harmony/enhanced/classlib/trunk/modules/x-net/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/make/run-test.xml?rev=795543&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/x-net/make/run-test.xml (added)
+++ harmony/enhanced/classlib/trunk/modules/x-net/make/run-test.xml Sun Jul 19 13:53:28 2009
@@ -0,0 +1,62 @@
+<?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.
+-->
+
+<project name="Harmony X-Net Test" default="test" basedir=".">
+
+    <property name="hy.hdk" location="../../.." />
+    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
+    <property file="../test.properties" />
+    <import file="../../ant/properties.xml" />
+
+    <property name="work.dir" value=".." />
+    <property name="target.dir" value=".." />
+    <property name="tests.output" location="../report" />
+    <property name="junit.jar" location="../junit.jar" />
+
+    <target name="test" depends="test-module" />
+
+    <target name="test-module" depends="test-jre-vm-info">
+        <convert-test-as-class from="test.case" to="converted.tc.class" />
+        <run-hdk-tests module="x-net" jar="x-net_api_tests.jar">
+            <junit-elements>
+                <classpath>
+                    <pathelement path="x-net_test_support.jar" />
+                    <pathelement path="resources" />
+                </classpath>
+            </junit-elements>
+        </run-hdk-tests>
+        <run-hdk-tests module="x-net" jar="x-net_impl_tests.jar">
+            <junit-elements>
+                <classpath>
+                    <pathelement path="x-net_test_support.jar" />
+                    <pathelement path="resources" />
+                </classpath>
+            </junit-elements>
+        </run-hdk-tests>
+        <run-hdk-tests module="x-net" jar="x-net_impl_boot_tests.jar">
+            <junit-elements>
+                <jvmarg value="-Xbootclasspath/a:x-net_impl_boot_tests.jar${path.separator}x-net_test_support.jar${path.separator}../junit.jar${path.separator}../support.jar"/>
+                <classpath>
+                    <pathelement path="resources" />
+                </classpath>
+            </junit-elements>
+        </run-hdk-tests>
+
+    </target>
+    
+</project>

Propchange: harmony/enhanced/classlib/trunk/modules/x-net/make/run-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message