harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r793887 - in /harmony/enhanced/classlib/trunk/modules/security: build.xml make/run-test.xml
Date Tue, 14 Jul 2009 12:37:53 GMT
Author: hindessm
Date: Tue Jul 14 12:37:52 2009
New Revision: 793887

URL: http://svn.apache.org/viewvc?rev=793887&view=rev
Log:
Allow security tests to run from the hdk.

Added:
    harmony/enhanced/classlib/trunk/modules/security/make/run-test.xml   (with props)
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=793887&r1=793886&r2=793887&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/security/build.xml Tue Jul 14 12:37:52 2009
@@ -64,6 +64,9 @@
     <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" />
     <property name="security.exclude.file"
               location="${tests.hdk.dir}/test.exclude" />
 
@@ -187,6 +190,9 @@
 
     <target name="test-jar" depends="svn-info, compile-tests">
 	<mkdir dir="${tests.hdk.dir}"/>
+
+        <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
+
         <jar destfile="${tests.hdk.dir}/security_tests_api.jar">
             <fileset refid="tests.api" />
             <manifest>
@@ -218,6 +224,20 @@
             </manifest>
         </jar>
 
+        <copy todir="${tests.resources.hdk.dir}">
+            <fileset dir="src/test/resources" />
+        </copy>
+
+        <mkdir dir="${tests.excludes.hdk.dir}"/>
+        <copy todir="${tests.excludes.hdk.dir}">
+            <fileset dir="./make" includes="exclude*"/>
+            <filterchain>
+                <tokenfilter>
+                    <replaceregex pattern="\.java" replace="\.class" flags="g"/>
+                </tokenfilter>
+            </filterchain>
+        </copy>
+
         <copy file="../../${junit.jar}" todir="${hy.hdk}/build/test" />
     </target>
 

Added: harmony/enhanced/classlib/trunk/modules/security/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/make/run-test.xml?rev=793887&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/make/run-test.xml (added)
+++ harmony/enhanced/classlib/trunk/modules/security/make/run-test.xml Tue Jul 14 12:37:52
2009
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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="Harmony Security Test" default="test" basedir=".">
+
+    <property name="test.jre.home" location="../../../jdk/jre" />
+    <property file="../test.properties" />
+    <import file="../properties.xml" />
+
+    <property name="work.dir" value=".." />
+    <property name="target.dir" value=".." />
+    <property name="test.report.dir" location="../report" />
+    <property name="junit.jar" location="../junit.jar" />
+
+    <target name="test" depends="test-module" />
+
+    <target name="test-module" depends="test-jre-vm-info">
+        <convert-test-as-class from="test.case" to="converted.tc.class" />
+        <run-hdk-tests module="security" jar="security_tests_api.jar">
+            <junit-elements>
+                <classpath>
+                    <pathelement path="security_tests_support.jar" />
+                </classpath>
+            </junit-elements>
+        </run-hdk-tests>
+        <run-hdk-tests module="security" jar="security_tests_api_in.jar">
+            <junit-elements>
+                <jvmarg value="-Xbootclasspath/a:security_tests_api_in.jar${path.separator}../junit.jar${path.separator}../support.jar${path.separator}security_tests_support.jar"/>
+            </junit-elements>
+        </run-hdk-tests>
+        <run-hdk-tests module="security" jar="security_tests_impl.jar">
+            <junit-elements>
+                <classpath>
+                    <pathelement path="security_tests_support.jar" />
+                </classpath>
+            </junit-elements>
+        </run-hdk-tests>
+        <run-hdk-tests module="security" jar="security_tests_impl_in.jar">
+            <junit-elements>
+                <jvmarg value="-Xbootclasspath/a:security_tests_impl_in.jar${path.separator}../junit.jar${path.separator}../support.jar${path.separator}security_tests_support.jar"/>
+            </junit-elements>
+        </run-hdk-tests>
+    </target>
+    
+</project>

Propchange: harmony/enhanced/classlib/trunk/modules/security/make/run-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message