harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r422310 - /incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml
Date Sat, 15 Jul 2006 22:39:34 GMT
Author: ndbeyer
Date: Sat Jul 15 15:39:33 2006
New Revision: 422310

URL: http://svn.apache.org/viewvc?rev=422310&view=rev
Log:
Apply patch for HARMONY-871: [classlib][logging] logging tests depends on execution order

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml

Modified: incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml?rev=422310&r1=422309&r2=422310&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml Sat Jul 15 15:39:33
2006
@@ -1,193 +1,200 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Copyright 2006 The Apache Software Foundation or its
-    licensors, as applicable.
-  
-    Licensed 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="LOGGING Build" default="build" basedir=".">
-    <description>Build for LOGGING component</description>
-
-    <!-- import common properties -->
-    <import file="${basedir}/../../make/properties.xml" />
-
-    <!-- set global properties for this build. -->
-    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
-
-    <fileset id="classes" dir="${hy.build}">
-        <includesfile name="${hy.logging}/make/patternset.txt" />
-        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
-        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
-    </fileset>
-                               
-    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
-	     use the Eclipse Java compiler. -->
-    <property name="build.compiler" value="modern" />
-
-    <target name="build" depends="compile.java, build.jar, copy.resources" />
-
-    <target name="test" depends="build, compile.tests, run.tests" />
-
-    <target name="clean">
-        <delete failonerror="false">
-            <fileset refid="classes" />
-            <fileset dir="${hy.logging.bin.test}" />
-        </delete>
-    </target>
-
-    <target name="compile.java" depends="copy.resources">
-        <echo message="Compiling LOGGING classes" />
-
-        <mkdir dir="${hy.build}" />
-
-        <javac sourcepath=""
-               srcdir="${hy.logging.src.main.java}"
-               destdir="${hy.build}"
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-        </javac>
-    </target>
-
-    <target name="build.jar">
-        <jar destfile="${hy.jdk}/jre/lib/boot/logging.jar"
-             manifest="${hy.logging}/META-INF/MANIFEST.MF">
-            <fileset refid="classes" />
-        </jar>
-    </target>
-
-    <target name="compile.tests" depends="copy.test.resources" >
-        <echo message="Compiling LOGGING tests" />
-
-        <mkdir dir="${hy.logging.bin.internal}" />
-        <mkdir dir="${hy.logging.bin.test}" />
-
-        <javac srcdir="${hy.logging.src.test.internal}"
-               destdir="${hy.logging.bin.internal}"
-               sourcepath=""
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-            <classpath location="${hy.hdk}/build/test/support.jar" />
-            <classpath location="../../build/tests" />
-        </javac>
-        <javac srcdir="${hy.logging.src.test.java}"
-               destdir="${hy.logging.bin.test}"
-               sourcepath=""
-               source="${hy.javac.source}"
-               target="${hy.javac.target}"
-               debug="${hy.javac.debug}">
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-                <pathelement path="${hy.logging.bin.internal}"/>
-            </bootclasspath>
-            <classpath location="${hy.hdk}/build/test/support.jar" />
-            <classpath location="../../build/tests" />
-        </javac>
-    </target>
-
-    <target name="run.tests">
-
-        <mkdir dir="${hy.tests.reports}" />
-
-        <property name="test.jre.home" value="${hy.jdk}/jre" />
-
-        <junit fork="yes"
-               forkmode="once"
-               printsummary="withOutAndErr"
-               errorproperty="test.errors"
-               failureproperty="test.failures"
-               showoutput="on"
-               dir="${hy.logging.bin.test}"
-               jvm="${test.jre.home}/bin/java">
-
-            <jvmarg value="-showversion"/>
-
-            <env key="JAVA_HOME" value="${test.jre.home}"/>
-
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-                <pathelement path="${hy.logging.bin.internal}"/>
-            </bootclasspath>
-            <classpath>
-                <pathelement path="${hy.logging.bin.test}"/>
-            </classpath>
-            <classpath location="${hy.hdk}/build/test/support.jar" />
-            <classpath location="../../build/tests" />
-
-            <formatter type="xml" />
-
-            <test name="${test.case}" todir="${hy.tests.reports}"
-                 if="test.case" />
-
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
-                unless="test.case">
-
-                <fileset dir="${hy.logging.src.test.java}">
-                    <include name="org/apache/harmony/logging/tests/java/util/logging/*Test.java"/>
-                    <exclude name="org/apache/harmony/logging/tests/java/util/logging/FileHandlerTest.java"
/>
-                	<exclude name="org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java"
/>
-                    <exclude name="org/apache/harmony/logging/tests/java/util/logging/SocketHandlerTest.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="${hy.tests.reports}/test.failures"
-            append="true">logging${line.separator}</echo>
-    </target>
-
-    <target name="touch-errors-file" if="test.errors">
-        <echo file="${hy.tests.reports}/test.errors"
-            append="true">logging${line.separator}</echo>
-    </target>
-
-    <target name="copy.resources">
-        <copy todir="${hy.jdk}/jre/lib" overwrite="yes" flatten="yes">
-            <fileset dir="${hy.logging.src.main.java}">
-                <include name="**/logging.properties" />
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="copy.test.resources">
-        <mkdir dir="${hy.logging.bin.test}" />
-        <copy todir="${hy.logging.bin.test}" includeemptydirs="false">
-            <fileset dir="${hy.logging.src.test.resources}">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
-    </target>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2006 The Apache Software Foundation or its
+    licensors, as applicable.
+  
+    Licensed 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="LOGGING Build" default="build" basedir=".">
+    <description>Build for LOGGING component</description>
+
+    <!-- import common properties -->
+    <import file="${basedir}/../../make/properties.xml" />
+
+    <!-- set global properties for this build. -->
+    <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
+
+    <fileset id="classes" dir="${hy.build}">
+        <includesfile name="${hy.logging}/make/patternset.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/luni-kernel.txt" />
+        <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
+    </fileset>
+                               
+    <!-- Set build.compiler to "org.eclipse.jdt.core.JDTCompilerAdapter" to
+	     use the Eclipse Java compiler. -->
+    <property name="build.compiler" value="modern" />
+
+    <target name="build" depends="compile.java, build.jar, copy.resources" />
+
+    <target name="test" depends="build, compile.tests, run.tests" />
+
+    <target name="clean">
+        <delete failonerror="false">
+            <fileset refid="classes" />
+            <fileset dir="${hy.logging.bin.test}" />
+        </delete>
+    </target>
+
+    <target name="compile.java" depends="copy.resources">
+        <echo message="Compiling LOGGING classes" />
+
+        <mkdir dir="${hy.build}" />
+
+        <javac sourcepath=""
+               srcdir="${hy.logging.src.main.java}"
+               destdir="${hy.build}"
+               source="${hy.javac.source}"
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+        </javac>
+    </target>
+
+    <target name="build.jar">
+        <jar destfile="${hy.jdk}/jre/lib/boot/logging.jar"
+             manifest="${hy.logging}/META-INF/MANIFEST.MF">
+            <fileset refid="classes" />
+        </jar>
+    </target>
+
+    <target name="compile.tests" depends="copy.test.resources" >
+        <echo message="Compiling LOGGING tests" />
+
+        <mkdir dir="${hy.logging.bin.internal}" />
+        <mkdir dir="${hy.logging.bin.test}" />
+
+        <javac srcdir="${hy.logging.src.test.internal}"
+               destdir="${hy.logging.bin.internal}"
+               sourcepath=""
+               source="${hy.javac.source}"
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+            <classpath location="${hy.hdk}/build/test/support.jar" />
+            <classpath location="../../build/tests" />
+        </javac>
+        <javac srcdir="${hy.logging.src.test.java}"
+               destdir="${hy.logging.bin.test}"
+               sourcepath=""
+               source="${hy.javac.source}"
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+                <pathelement path="${hy.logging.bin.internal}"/>
+            </bootclasspath>
+            <classpath location="${hy.hdk}/build/test/support.jar" />
+            <classpath location="../../build/tests" />
+        </javac>
+    </target>
+
+    <target name="run.tests">
+
+        <mkdir dir="${hy.tests.reports}" />
+
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
+
+        <junit fork="yes"
+               forkmode="once"
+               printsummary="withOutAndErr"
+               errorproperty="test.errors"
+               failureproperty="test.failures"
+               showoutput="on"
+               dir="${hy.logging.bin.test}"
+               jvm="${test.jre.home}/bin/java">
+
+            <jvmarg value="-showversion"/>
+
+            <env key="JAVA_HOME" value="${test.jre.home}"/>
+
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+                <pathelement path="${hy.logging.bin.internal}"/>
+            </bootclasspath>
+            <classpath>
+                <pathelement path="${hy.logging.bin.test}"/>
+            </classpath>
+            <classpath location="${hy.hdk}/build/test/support.jar" />
+            <classpath location="../../build/tests" />
+
+            <formatter type="xml" />
+
+            <test name="${test.case}" todir="${hy.tests.reports}"
+                 if="test.case" />
+
+            <!-- run LogManagerTest in separated VM -->
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+                unless="test.case">
+
+                <fileset dir="${hy.logging.src.test.java}">
+                    <include name="org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.java"/>
+                </fileset>
+            </batchtest>
+
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
+                unless="test.case">
+
+                <fileset dir="${hy.logging.src.test.java}">
+                    <include name="org/apache/harmony/logging/tests/java/util/logging/*Test.java"/>
+                    <exclude name="org/apache/harmony/logging/tests/java/util/logging/LogManagerTest.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="${hy.tests.reports}/test.failures"
+            append="true">logging${line.separator}</echo>
+    </target>
+
+    <target name="touch-errors-file" if="test.errors">
+        <echo file="${hy.tests.reports}/test.errors"
+            append="true">logging${line.separator}</echo>
+    </target>
+
+    <target name="copy.resources">
+        <copy todir="${hy.jdk}/jre/lib" overwrite="yes" flatten="yes">
+            <fileset dir="${hy.logging.src.main.java}">
+                <include name="**/logging.properties" />
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="copy.test.resources">
+        <mkdir dir="${hy.logging.bin.test}" />
+        <copy todir="${hy.logging.bin.test}" includeemptydirs="false">
+            <fileset dir="${hy.logging.src.test.resources}">
+                <exclude name="**/*.java" />
+            </fileset>
+        </copy>
+    </target>
+
+</project>



Mime
View raw message