harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r453122 - /incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml
Date Thu, 05 Oct 2006 07:17:55 GMT
Author: hindessm
Date: Thu Oct  5 00:17:54 2006
New Revision: 453122

URL: http://svn.apache.org/viewvc?view=rev&rev=453122
Log:
Applied accessibility patch from "[#HARMONY-984] [testing] collect
modules/bin/tests directories to one tests.jar".

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

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?view=diff&rev=453122&r1=453121&r2=453122
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/accessibility/build.xml Thu Oct  5 00:17:54
2006
@@ -31,14 +31,17 @@
         <excludesfile name="${hy.hdk}/build/patternsets/security-kernel.txt" />
     </fileset>
 
+    <fileset id="tests" dir="${hy.accessibility.bin.test}"/>
+
     <property file="../../make/depends.properties" />
 
     <target name="build" depends="compile-java, copy-resources, build-jar" />
 
-    <target name="test" depends="build, compile-tests, run-tests" />
+    <target name="test" depends="build, compile-tests, test-jar, run-tests" />
 
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/${hy.accessibility.packaging.jarname}.jar"
/>
+        <delete file="${hy.jdk}/build/test/${hy.accessibility.packaging.jarname}_tests.jar"
/>
         <delete failonerror="false">
             <fileset refid="classes" />
             <fileset dir="${hy.accessibility.bin.test}" />
@@ -77,6 +80,7 @@
     </target>
 
     <target name="build-jar" depends="svn-info">
+        <mkdir dir="${hy.jdk}/jre/lib/boot"/>
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.accessibility.packaging.jarname}.jar"
              manifest="${hy.accessibility}/META-INF/MANIFEST.MF">
             <fileset refid="classes" />
@@ -86,6 +90,16 @@
         </jar>
     </target>
 
+    <target name="test-jar" depends="svn-info">
+	<mkdir dir="${hy.jdk}/build/test"/>
+        <jar destfile="${hy.jdk}/build/test/${hy.accessibility.packaging.jarname}_tests.jar">
+            <fileset refid="tests" />
+            <manifest>
+                <attribute name="Implementation-Version" value="${svn.info}"/> 
+            </manifest>
+        </jar>
+    </target>
+
     <target name="compile-tests">
         <echo message="Compiling ACCESSIBILITY tests" />
 
@@ -125,7 +139,7 @@
                dir="${basedir}"
                jvm="${test.jre.home}/bin/java">
 
-            <jvmarg value="-Xbootclasspath/a:${hy.accessibility.bin.test}${path.separator}../../${junit.jar}${path.separator}${hy.hdk}/build/test/support.jar"/>
+            <jvmarg value="-Xbootclasspath/a:${hy.jdk}/build/test/${hy.accessibility.packaging.jarname}_tests.jar${path.separator}../../${junit.jar}${path.separator}${hy.hdk}/build/test/support.jar"/>
 
             <formatter type="xml" />
 



Mime
View raw message