You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2006/06/26 19:31:06 UTC
svn commit: r417244 - in /incubator/harmony/enhanced/classlib/trunk: ./
make/ modules/accessibility/ modules/annotation/ modules/archive/
modules/beans/ modules/crypto/ modules/logging/ modules/luni/ modules/nio/
modules/nio_char/ modules/prefs/ module...
Author: hindessm
Date: Mon Jun 26 10:31:05 2006
New Revision: 417244
URL: http://svn.apache.org/viewvc?rev=417244&view=rev
Log:
Build a test support jar.
Modified:
incubator/harmony/enhanced/classlib/trunk/build.xml
incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml
Modified: incubator/harmony/enhanced/classlib/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/build.xml?rev=417244&r1=417243&r2=417244&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/build.xml Mon Jun 26 10:31:05 2006
@@ -88,6 +88,10 @@
========================================
</echo>
<ant antfile="native-src/build.xml" inheritall="false" target="build"/>
+
+ <ant antfile="make/build-test.xml" inheritall="false"
+ target="support.jar"/>
+
<antcall target="build-awt-swing" />
</target>
Modified: incubator/harmony/enhanced/classlib/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/build-test.xml?rev=417244&r1=417243&r2=417244&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/build-test.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/build-test.xml Mon Jun 26 10:31:05 2006
@@ -31,6 +31,7 @@
<property name="hy.jdk" location="${hy.hdk}/jdk" />
<property name="tests.build.output" location="build/tests" />
+ <property name="tests.support.output" location="uild/test_support" />
<property name="support.dir" location="support"/>
<property name="tests.depends.jars" location="deploy/jdk/jre/lib/boot" />
<property file="make/depends.properties" />
@@ -61,17 +62,25 @@
<echo message="The test report is in ${display-location}"/>
</target>
+ <target name="support.jar" depends="compile-support">
+ <mkdir dir="${hy.hdk}/build/test" />
+ <jar destfile="${hy.hdk}/build/test/support.jar"
+ manifest="support/META-INF/MANIFEST.MF">
+ <fileset dir="${tests.support.output}" />
+ </jar>
+ </target>
+
<target name="compile-support" depends="copy-test-resources, check-support-jars"
description="Compile the unit test source">
- <mkdir dir="${tests.build.output}" />
- <javac destdir="${tests.build.output}"
+ <mkdir dir="${tests.support.output}" />
+ <javac destdir="${tests.support.output}"
source="${hy.javac.source}"
target="${hy.javac.target}"
debug="on">
<src path="${support.dir}/src/test/java" />
<classpath location="${junit.jar}" />
- <classpath location="${tests.build.output}" />
+ <classpath location="${tests.support.output}" />
<bootclasspath>
<fileset dir="${tests.depends.jars}">
<include name="**/*.jar" />
@@ -95,8 +104,15 @@
================================= -->
<target name="copy-test-resources"
description="Copy non-Java files from unit test trees to the bin output">
- <mkdir dir="${tests.build.output}" />
+ <mkdir dir="${tests.support.output}" />
+ <copy todir="${tests.support.output}" includeemptydirs="false">
+ <fileset dir="${support.dir}/src/test/java">
+ <exclude name="**/*.java" />
+ </fileset>
+ </copy>
+
+ <mkdir dir="${tests.build.output}" />
<copy todir="${tests.build.output}" includeemptydirs="false">
<fileset dir="${support.dir}/src/test/java">
<exclude name="**/*.java" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml?rev=417244&r1=417243&r2=417244&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml Mon Jun 26 10:31:05 2006
@@ -91,6 +91,7 @@
</fileset>
</bootclasspath>
<classpath location="../../build/tests" />
+ <classpath location="${hy.hdk}/build/test/support.jar" />
</javac>
</target>
@@ -116,6 +117,7 @@
<classpath>
<pathelement path="${hy.accessibility.bin.test}"/>
</classpath>
+ <classpath location="${hy.hdk}/build/test/support.jar" />
<formatter type="xml" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml?rev=417244&r1=417243&r2=417244&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/annotation/build.xml Mon Jun 26 10:31:05 2006
@@ -91,6 +91,7 @@
</fileset>
</bootclasspath>
<classpath location="../../build/tests" />
+ <classpath location="${hy.hdk}/build/test/support.jar" />
</javac>
</target>
@@ -116,6 +117,7 @@
<classpath>
<pathelement path="${hy.annotation.bin.test}"/>
</classpath>
+ <classpath location="${hy.hdk}/build/test/support.jar" />
<formatter type="xml" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml?rev=417244&r1=417243&r2=417244&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/build.xml Mon Jun 26 10:31:05 2006
@@ -107,7 +107,7 @@
<include name="**/*.jar" />
</fileset>
</bootclasspath>
- <classpath location="../../build/tests" />
+ <classpath location="${hy.hdk}/build/test/support.jar" />
</javac>
</target>
@@ -134,6 +134,7 @@
<pathelement path="${hy.archive.bin.test}"/>
</classpath>
<classpath location="../../build/tests" />
+ <classpath location="${hy.hdk}/build/test/support.jar" />
<formatter type="xml" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml?rev=417244&r1=417243&r2=417244&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/build.xml Mon Jun 26 10:31:05 2006
@@ -93,6 +93,7 @@
</fileset>
</bootclasspath>
<classpath location="../../build/tests" />
+ <classpath location="${hy.hdk}/build/test/support.jar" />
</javac>
<echo message="Compiling BEANS tests" />
@@ -109,6 +110,7 @@
</fileset>
</bootclasspath>
<classpath location="../../build/tests" />
+ <classpath location="${hy.hdk}/build/test/support.jar" />
</javac>
</target>
@@ -175,6 +177,7 @@
<pathelement path="${hy.beans.src.test.resources}"/>
</classpath>
<classpath location="../../build/tests" />
+ <classpath location="${hy.hdk}/build/test/support.jar" />
<formatter type="xml" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml?rev=417244&r1=417243&r2=417244&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/build.xml Mon Jun 26 10:31:05 2006
@@ -134,7 +134,8 @@
<classpath>
<pathelement path="${hy.crypto.bin.test}/api"/>
- <pathelement path="../../build/tests"/>
+ <pathelement path="${hy.hdk}/build/test/support.jar" />
+ <pathelement path="../../build/tests" />
</classpath>
<batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
@@ -149,7 +150,7 @@
<run-tests description="api.injected tests">
<junit-elements>
<!-- to pick up junit.jar -->
- <jvmarg value="-Xbootclasspath/a:${hy.crypto.bin.test}/api.injected${path.separator}../../../../${junit.jar}${path.separator}../../../../build/tests"/>
+ <jvmarg value="-Xbootclasspath/a:${hy.crypto.bin.test}/api.injected${path.separator}../../../../${junit.jar}${path.separator}../../../../build/tests${path.separator}${hy.hdk}/build/test/support.jar"/>
<batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
<fileset dir="${hy.crypto.src.test}/api/java.injected">
@@ -169,7 +170,7 @@
<junit-elements>
<classpath>
<pathelement path="${hy.crypto.bin.test}/impl"/>
- <pathelement path="../../build/tests"/>
+ <pathelement path="${hy.hdk}/build/test/support.jar" />
</classpath>
<batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
@@ -233,6 +234,7 @@
</fileset>
</bootclasspath>
<classpath location="../../build/tests" />
+ <classpath location="${hy.hdk}/build/test/support.jar" />
</javac>
</sequential>
</macrodef>
@@ -263,6 +265,7 @@
<classpath>
<pathelement path="${hy.crypto.src.test.resources}"/>
+ <pathelement path="../../build/tests" />
</classpath>
<formatter type="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=417244&r1=417243&r2=417244&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/logging/build.xml Mon Jun 26 10:31:05 2006
@@ -91,6 +91,7 @@
<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}"
@@ -106,6 +107,7 @@
</fileset>
<pathelement path="${hy.logging.bin.internal}"/>
</bootclasspath>
+ <classpath location="${hy.hdk}/build/test/support.jar" />
<classpath location="../../build/tests" />
</javac>
</target>
@@ -138,6 +140,7 @@
<classpath>
<pathelement path="${hy.logging.bin.test}"/>
</classpath>
+ <classpath location="${hy.hdk}/build/test/support.jar" />
<classpath location="../../build/tests" />
<formatter type="xml" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml?rev=417244&r1=417243&r2=417244&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Mon Jun 26 10:31:05 2006
@@ -164,7 +164,7 @@
<include name="**/*.jar" />
</fileset>
</bootclasspath>
- <classpath location="${hy.tests.support.bin}" />
+ <classpath location="${hy.hdk}/build/test/support.jar" />
</javac>
</target>
@@ -195,7 +195,7 @@
<classpath>
<pathelement path="${hy.luni.bin.test}" />
- <pathelement path="${hy.tests.support.bin}" />
+ <pathelement path="${hy.hdk}/build/test/support.jar" />
</classpath>
<formatter type="xml" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml?rev=417244&r1=417243&r2=417244&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml Mon Jun 26 10:31:05 2006
@@ -90,7 +90,7 @@
<include name="**/*.jar" />
</fileset>
</bootclasspath>
- <classpath location="../../build/tests" />
+ <classpath location="${hy.hdk}/build/test/support.jar" />
</javac>
</target>
@@ -115,7 +115,7 @@
<classpath>
<pathelement path="${hy.nio.bin.test}"/>
- <pathelement path="../../build/tests" />
+ <pathelement path="${hy.hdk}/build/test/support.jar" />
</classpath>
<formatter type="xml" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml?rev=417244&r1=417243&r2=417244&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio_char/build.xml Mon Jun 26 10:31:05 2006
@@ -89,6 +89,7 @@
</fileset>
</bootclasspath>
<classpath location="../../build/tests" />
+ <classpath location="${hy.hdk}/build/test/support.jar" />
</javac>
</target>
@@ -114,6 +115,7 @@
<classpath>
<pathelement path="${hy.nio_char.bin.test}"/>
<pathelement path="../../build/tests" />
+ <pathelement path="${hy.hdk}/build/test/support.jar" />
</classpath>
<formatter type="xml" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml?rev=417244&r1=417243&r2=417244&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/prefs/build.xml Mon Jun 26 10:31:05 2006
@@ -120,6 +120,7 @@
</fileset>
</bootclasspath>
<classpath location="../../build/tests" />
+ <classpath location="${hy.hdk}/build/test/support.jar" />
</javac>
</target>
@@ -146,6 +147,7 @@
<pathelement path="${hy.prefs.bin.test}"/>
</classpath>
<classpath location="../../build/tests" />
+ <classpath location="${hy.hdk}/build/test/support.jar" />
<formatter type="xml" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml?rev=417244&r1=417243&r2=417244&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/build.xml Mon Jun 26 10:31:05 2006
@@ -135,6 +135,7 @@
<classpath>
<pathelement path="${hy.security.bin.test}/api"/>
<pathelement path="../../build/tests"/>
+ <pathelement path="${hy.hdk}/build/test/support.jar" />
</classpath>
<!-- Required for running the unit tests -->
<!-- Note: will be deleted after improving -->
@@ -265,6 +266,7 @@
</fileset>
</bootclasspath>
<classpath location="../../build/tests" />
+ <classpath location="${hy.hdk}/build/test/support.jar" />
</javac>
</sequential>
</macrodef>
Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml?rev=417244&r1=417243&r2=417244&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml Mon Jun 26 10:31:05 2006
@@ -90,7 +90,7 @@
<include name="**/*.jar" />
</fileset>
</bootclasspath>
- <classpath location="${hy.tests.support.bin}" />
+ <classpath location="${hy.hdk}/build/test/support.jar" />
</javac>
</target>
@@ -116,7 +116,7 @@
<classpath>
<pathelement path="${hy.text.bin.test}"/>
</classpath>
- <classpath location="${hy.tests.support.bin}" />
+ <classpath location="${hy.hdk}/build/test/support.jar" />
<formatter type="xml" />