harmony-commits mailing list archives

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

URL: http://svn.apache.org/viewvc?rev=795511&view=rev
Log:
Run prefs tests using hdk.

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

Modified: harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?rev=795511&r1=795510&r2=795511&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/prefs/build.xml Sun Jul 19 10:28:50 2009
@@ -42,7 +42,12 @@
         </or>
     </fileset>
 
+    <property file="../../make/depends.properties" />
+
     <property name="tests.hdk.dir" value="${hy.hdk}/build/test/prefs" />
+    <property name="tests.excludes.hdk.dir" value="${tests.hdk.dir}/excludes" />
+    <property name="tests.resources.hdk.dir"
+              value="${tests.hdk.dir}/resources" />
     <property name="prefs.exclude.file"
               location="${tests.hdk.dir}/test.exclude" />
 
@@ -60,7 +65,7 @@
     </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" />
 
     <!-- Build natives. Currently there are only windows natives for
      prefs, so we check if we are on a windows platform -->
@@ -85,6 +90,7 @@
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/prefs.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/prefs-src.jar" />
+        <delete file="${tests.hdk.dir}/prefs_tests.jar" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -92,12 +98,11 @@
     </target>
 
     <!-- Clean natives. Currently there are only windows natives for
-     prefs, so we check if we are on a windows platform -->
+         prefs, so we check if we are on a windows platform -->
     <target name="clean-native" if="is.windows">
-    <make dir="src/main/native/prefs/${hy.os.family}" target="clean" />
+        <make dir="src/main/native/prefs/${hy.os.family}" target="clean" />
     </target>
 
-
     <target name="compile-java">
         <echo message="Compiling PREFS classes" />
 
@@ -153,7 +158,37 @@
         </jar>
     </target>
 
-    <target name="compile-tests" depends="copy-test-resources">
+    <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}/prefs_tests.jar">
+            <fileset dir="bin/test" />
+            <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="prefs tests"
                        destdir="bin/test">
             <javac-elements>
@@ -164,83 +199,8 @@
         </compile-tests>
     </target>
 
-    <target name="prepare-exclude">
-       <prepare-exclude-list moduleName="prefs" dir="./make"
-                             result="${prefs.exclude.file}"/>
-    </target>
-
-    <target name="run-tests">
-
-        <mkdir dir="${tests.output}" />
-
-        <property name="test.jre.home" value="${hy.jdk}/jre" />
-
-        <junit fork="yes"
-            forkmode="perBatch"
-            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}" />
-
-            <classpath>
-                <pathelement path="bin/test"/>
-            </classpath>
-            <classpath location="../../build/tests" />
-            <classpath location="${hy.hdk}/build/test/support.jar" />
-
-            <formatter type="xml" />
-
-            <batchtest todir="${tests.output}" haltonfailure="no" >
-
-                <fileset dir="src/test/java">
-                    <!-- if ${test.case}     -->
-                    <include name="${converted.tc}" if="test.case" />
-                    <!-- unless ${test.case} -->
-                    <include name="**/*Test.java" unless="test.case" />
-                    <excludesfile name="${prefs.exclude.file}" unless="test.case" />
-
-                    <!--  These tests run in a separate jvm below -->
-                    <exclude name="org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java"
unless="test.case" />
-                </fileset>
-            </batchtest>
-
-            <batchtest todir="${tests.output}" haltonfailure="no" unless="test.case" >
-                <fileset dir="src/test/java">
-                    <include name="org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.java"
/>
-                </fileset>
-            </batchtest>
-
-        </junit>
-        <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">prefs${line.separator}</echo>
-    </target>
-
-    <target name="touch-errors-file" if="test.errors">
-        <echo file="${tests.output}/test.errors"
-            append="true">prefs${line.separator}</echo>
-    </target>
-
-    <target name="copy-test-resources">
-        <mkdir dir="bin/test" />
-        <copy todir="bin/test" includeemptydirs="false">
-            <fileset dir="src/test/resources">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
+    <target name="run-tests" depends="test-jar">
+        <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
 </project>

Added: harmony/enhanced/classlib/trunk/modules/prefs/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/prefs/make/run-test.xml?rev=795511&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/prefs/make/run-test.xml (added)
+++ harmony/enhanced/classlib/trunk/modules/prefs/make/run-test.xml Sun Jul 19 10:28:50 2009
@@ -0,0 +1,48 @@
+<?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 Prefs 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-selected-hdk-tests module="prefs" jar="prefs_tests.jar">
+            <excludeorinclude>
+                <exclude name="org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.class"
unless="test.case" />
+                <include name="**/*Test.class" unless="test.case"/>
+            </excludeorinclude>
+        </run-selected-hdk-tests>
+        <run-selected-hdk-tests module="prefs" jar="prefs_tests.jar">
+            <excludeorinclude>
+                <include name="org/apache/harmony/prefs/tests/java/util/prefs/FilePreferencesImplTest.class"
unless="test.case" />
+            </excludeorinclude>
+        </run-selected-hdk-tests>
+    </target>
+    
+</project>

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



Mime
View raw message