harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r794070 - /harmony/enhanced/classlib/trunk/modules/security/build.xml
Date Tue, 14 Jul 2009 21:23:17 GMT
Author: hindessm
Date: Tue Jul 14 21:23:14 2009
New Revision: 794070

URL: http://svn.apache.org/viewvc?rev=794070&view=rev
Log:
Run security tests using hdk during classlib test process.

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=794070&r1=794069&r2=794070&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security/build.xml Tue Jul 14 21:23:14 2009
@@ -57,13 +57,10 @@
     <fileset id="tests.impl" dir="bin/test/impl"/>
     <fileset id="tests.impl.in" dir="bin/test/impl.injected"/>
     <fileset id="tests.support" dir="bin/test/support"/>
-    <fileset id="resources" dir="./src/test/resources"/>
 
     <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/security" />
     <property name="tests.excludes.hdk.dir" value="${tests.hdk.dir}/excludes" />
     <property name="tests.resources.hdk.dir"
               value="${tests.hdk.dir}/resources" />
@@ -84,7 +81,7 @@
     </target>
 
     <!-- internal target for local and global test run sequence -->
-    <target name="-test-module" depends="build, compile-tests, test-jar, copy-tests-resources,
prepare-exclude, run-tests" />
+    <target name="-test-module" depends="build, run-tests" />
 
     <!-- Build native code -->
     <available file="src/main/native/security/${hy.os.family}" property="native.present"
/>
@@ -121,7 +118,7 @@
         <delete file="${tests.hdk.dir}/security_tests_impl.jar" />
         <delete file="${tests.hdk.dir}/security_tests_impl_in.jar" />
         <delete file="${tests.hdk.dir}/security_tests_support.jar" />
-        <delete dir="${tests.resources.dir}" />
+        <delete dir="${tests.resources.hdk.dir}" />
         <delete failonerror="false">
             <fileset refid="classes" />
         </delete>
@@ -241,13 +238,6 @@
         <copy file="../../${junit.jar}" todir="${hy.hdk}/build/test" />
     </target>
 
-    <target name="copy-tests-resources">
-        <mkdir dir="${tests.resources.dir}" />
-        <copy todir="${tests.resources.dir}" includeemptydirs="false">
-            <fileset refid="resources" />
-        </copy>
-    </target>
-
     <target name="compile-tests">
 
         <compile-tests description="test support files" destdir="bin/test/support">
@@ -298,112 +288,8 @@
         </compile-tests>
     </target>
 
-
-    <target name="prepare-exclude">
-       <prepare-exclude-list moduleName="security" dir="./make"
-                             result="${security.exclude.file}"/>
-    </target>
-
-    <target name="run-tests" depends="run-tests-api, run-tests-impl" />
-
-    <target name="run-tests-api">
-
-        <run-tests description="api tests">
-            <junit-elements>
-                <classpath>
-                    <pathelement path="${tests.hdk.dir}/security_tests_api.jar"/>
-                    <pathelement path="${tests.hdk.dir}/security_tests_support.jar"/>
-                    <pathelement path="${tests.resources.dir}"/>
-                    <pathelement path="${hy.hdk}/build/test/support.jar" />
-                </classpath>
-
-                <batchtest todir="${tests.output}" haltonfailure="no" >
-                    <fileset dir="src/test/api/java">
-                        <!-- if ${test.case}     -->
-                        <include name="${converted.tc}" if="test.case" />
-                        <!-- unless ${test.case} -->
-                        <include name="**/*Test.java" unless="test.case" />
-                        <excludesfile name="${security.exclude.file}" unless="test.case"
/>
-                    </fileset>
-                </batchtest>
-
-            </junit-elements>
-        </run-tests>
-
-        <run-tests description="api.injected tests">
-            <junit-elements>
-                <!-- to pick up junit.jar               -->
-                <jvmarg value="-Xbootclasspath/a:${tests.hdk.dir}/security_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}/security_tests_support.jar"/>
-
-                <batchtest todir="${tests.output}" haltonfailure="no" >
-                    <fileset dir="src/test/api/java.injected">
-                        <!-- if ${test.case}     -->
-                        <include name="${converted.tc}" if="test.case" />
-                        <!-- unless ${test.case} -->
-                        <include name="**/*Test.java" unless="test.case" />
-                        <excludesfile name="${security.exclude.file}" unless="test.case"
/>
-                    </fileset>
-                </batchtest>
-
-            </junit-elements>
-        </run-tests>
-
-        <antcall target="touch-failures-file" />
-        <antcall target="touch-errors-file" />
-    </target>
-
-    <target name="run-tests-impl" unless="test.noimpl">
-        <run-tests description="impl tests">
-            <junit-elements>
-                <classpath>
-                    <pathelement path="${tests.hdk.dir}/security_tests_impl.jar"/>
-                    <pathelement path="${tests.hdk.dir}/security_tests_support.jar"/>
-                    <pathelement path="${hy.hdk}/build/test/support.jar" />
-                </classpath>
-                
-                <batchtest todir="${tests.output}" haltonfailure="no" >
-                    <fileset dir="src/test/impl/java">
-                        <!-- if ${test.case}     -->
-                        <include name="${converted.tc}" if="test.case" />
-                        <!-- unless ${test.case} -->
-                        <include name="**/*Test.java" unless="test.case" />
-                        <excludesfile name="${security.exclude.file}" unless="test.case"
/>
-                    </fileset>
-                </batchtest>
-
-            </junit-elements>
-        </run-tests>
-
-        <run-tests description="impl injected tests">
-            <junit-elements>
-                <!-- to pick up junit.jar               -->
-                <jvmarg value="-Xbootclasspath/a:${tests.hdk.dir}/security_tests_impl_in.jar${path.separator}../junit.jar${path.separator}${hy.hdk}/build/test/support.jar${path.separator}${tests.hdk.dir}/security_tests_support.jar"/>
-
-                <batchtest todir="${tests.output}" haltonfailure="no" >
-                    <fileset dir="src/test/impl/java.injected">
-                        <!-- if ${test.case}     -->
-                        <include name="${converted.tc}" if="test.case" />
-                        <!-- unless ${test.case} -->
-                        <include name="**/*Test.java" unless="test.case" />
-                        <excludesfile name="${security.exclude.file}" unless="test.case"
/>
-                    </fileset>
-                </batchtest>
-
-            </junit-elements>
-        </run-tests>
-
-        <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">security${line.separator}</echo>
-    </target>
-
-    <target name="touch-errors-file" if="test.errors">
-        <echo file="${tests.output}/test.errors"
-            append="true">security${line.separator}</echo>
+    <target name="run-tests" depends="test-jar">
+        <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
     <macrodef name="compile-tests">
@@ -437,43 +323,4 @@
         </sequential>
     </macrodef>
 
-    <macrodef name="run-tests">
-        <attribute name="description" default="" />
-        <element name="junit-elements" />
-        <sequential>
-            <echo message="Running SECURITY @{description}" />
-
-            <mkdir dir="${tests.output}" />
-
-            <property name="test.jre.home" value="${hy.jdk}/jre" />
-
-            <junit fork="yes"
-                   forkmode="${hy.test.forkmode}"
-                   timeout="${hy.test.timeout}"
-                   printsummary="withOutAndErr"
-                   errorproperty="test.errors"
-                   failureproperty="test.failures"
-                   showoutput="on"
-                   dir="${tests.hdk.dir}"
-                   jvm="${test.jre.home}/bin/java">
-
-                <assertions enableSystemAssertions="true">
-                    <enable />
-                </assertions>
-
-                <jvmarg line="${hy.test.vmargs}" />
-                <!-- Used by Support_Exec.execJava() -->
-                <jvmarg value="-Dhy.test.vmargs=${hy.test.vmargs}" />
-
-                <junit-elements />
-
-                <classpath>
-                    <pathelement path="${tests.resources.dir}"/>
-                </classpath>
-
-                <formatter type="xml" />
-            </junit>
-        </sequential>
-    </macrodef>
-
 </project>



Mime
View raw message