harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r791928 - /harmony/enhanced/classlib/trunk/modules/security/build.xml
Date Tue, 07 Jul 2009 18:26:39 GMT
Author: hindessm
Date: Tue Jul  7 18:26:38 2009
New Revision: 791928

URL: http://svn.apache.org/viewvc?rev=791928&view=rev
Log:
Move test jar to subdirectory to reduce clutter in hdk tree.
Fix dependencies on test-jar target.
Run tests in hdk directory so behaviour is consistent with running tests
with the hdk.
Ensure junit.jar is in hdk build/test directory.

Modified:
    harmony/enhanced/classlib/trunk/modules/security/build.xml

Modified: harmony/enhanced/classlib/trunk/modules/security/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/build.xml?rev=791928&r1=791927&r2=791928&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security/build.xml Tue Jul  7 18:26:38 2009
@@ -61,6 +61,8 @@
     <property file="../../make/depends.properties" />
 
     <property name="tests.hdk.dir" value="${hy.hdk}/build/test/security" />
+    <property name="tests.resources.dir"
+              value="${tests.hdk.dir}/resources/${hy.security.packaging.jarname}" />
     <property name="security.exclude.file"
               location="${tests.hdk.dir}/test.exclude" />
 
@@ -107,9 +109,6 @@
         <make dir="${hy.security.src.main.native}/security/${hy.os.family}" target="clean"
/>
     </target>
 
-
-    <property name="tests.hdk.dir" value="${hy.hdk}/build/test" />
-    <property name="tests.resources.dir" value="${tests.hdk.dir}/resources/${hy.security.packaging.jarname}"
/>
     <target name="clean">
         <delete file="${hy.jdk}/jre/lib/boot/${hy.security.packaging.jarname}.jar" />
         <delete file="${hy.jdk}/jre/lib/boot/${hy.security.packaging.jarname}-src.jar"
/>
@@ -185,7 +184,7 @@
         </jar>
     </target>
 
-    <target name="test-jar" depends="svn-info">
+    <target name="test-jar" depends="svn-info, compile-tests">
 	<mkdir dir="${tests.hdk.dir}"/>
         <jar destfile="${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_api.jar">
             <fileset refid="tests.api" />
@@ -217,6 +216,8 @@
                 <attribute name="Implementation-Version" value="${svn.info}"/> 
             </manifest>
         </jar>
+
+        <copy file="../../${junit.jar}" todir="${hy.hdk}/build/test" />
     </target>
 
     <target name="copy-tests-resources">
@@ -311,7 +312,7 @@
         <run-tests description="api.injected tests">
             <junit-elements>
                 <!-- to pick up junit.jar               -->
-                <jvmarg value="-Xbootclasspath/a:${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_api_in.jar${path.separator}../../${junit.jar}${path.separator}../../build/tests${path.separator}${hy.hdk}/build/test/support.jar${path.separator}${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_support.jar"/>
+                <jvmarg value="-Xbootclasspath/a:${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_api_in.jar${path.separator}../junit.jar${path.separator}../../build/tests${path.separator}${hy.hdk}/build/test/support.jar${path.separator}${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_support.jar"/>
 
                 <batchtest todir="${tests.output}" haltonfailure="no" >
                     <fileset dir="${hy.security.src.test}/api/java.injected">
@@ -355,7 +356,7 @@
         <run-tests description="impl injected tests">
             <junit-elements>
                 <!-- to pick up junit.jar               -->
-                <jvmarg value="-Xbootclasspath/a:${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_impl_in.jar${path.separator}../../${junit.jar}${path.separator}${hy.hdk}/build/test/support.jar${path.separator}${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_support.jar"/>
+                <jvmarg value="-Xbootclasspath/a:${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_impl_in.jar${path.separator}../junit.jar${path.separator}${hy.hdk}/build/test/support.jar${path.separator}${tests.hdk.dir}/${hy.security.packaging.jarname}_tests_support.jar"/>
 
                 <batchtest todir="${tests.output}" haltonfailure="no" >
                     <fileset dir="${hy.security.src.test}/impl/java.injected">
@@ -432,7 +433,7 @@
                    errorproperty="test.errors"
                    failureproperty="test.failures"
                    showoutput="on"
-                   dir="${basedir}"
+                   dir="${tests.hdk.dir}"
                    jvm="${test.jre.home}/bin/java">
 
                 <assertions enableSystemAssertions="true">



Mime
View raw message