Return-Path: 
 <commits-return-62235-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 31335 invoked from network); 26 Apr 2010 18:28:52 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 26 Apr 2010 18:28:52 -0000
Received: (qmail 89856 invoked by uid 500); 26 Apr 2010 18:28:52 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 89834 invoked by uid 500); 26 Apr 2010 18:28:52 -0000
Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@harmony.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@harmony.apache.org>
List-Post: <mailto:commits@harmony.apache.org>
List-Id: <commits.harmony.apache.org>
Reply-To: dev@harmony.apache.org
Delivered-To: mailing list commits@harmony.apache.org
Received: (qmail 89827 invoked by uid 99); 26 Apr 2010 18:28:52 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Apr 2010 18:28:52 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Apr 2010 18:28:48 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 91DC02388978; Mon, 26 Apr 2010 18:28:04 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r938177 - in
 /harmony/enhanced/java/branches/mrh/jdktools/modules/jpda: build.xml
 make/run-test.xml
Date: Mon, 26 Apr 2010 18:28:04 -0000
To: commits@harmony.apache.org
From: hindessm@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100426182804.91DC02388978@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: hindessm
Date: Mon Apr 26 18:28:04 2010
New Revision: 938177

URL: http://svn.apache.org/viewvc?rev=938177&view=rev
Log:
Move jpda tests to hdk.

Added:
    harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/make/run-test.xml   (with props)
Modified:
    harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/build.xml

Modified: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/build.xml?rev=938177&r1=938176&r2=938177&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/build.xml Mon Apr 26 18:28:04 2010
@@ -27,27 +27,6 @@
     <import file="${hy.hdk}/build/ant/depends.xml" />
     <property file="../../make/depends.properties" />
     <property file="${common.resources}/make/depends.properties" />
-    
-    <!-- filename for tests exclude list -->
-    <property name="jpda.exclude.file"
-              location="${hy.hdk}/build/jpda.exclude" />
-
-    <fileset id="classes" dir="bin/main">
-        <or>
-            <present targetdir="src/main/java" />
-            <present targetdir="src/main/java">
-                <mapper type="regexp"
-                        from="^(.*?)(\$$[^/\\\.]*)?\.class$$"
-                        to="\1.java"/>
-            </present>
-        </or>
-    </fileset>
-
-    <target name="fetch-depends">
-        <fetch dep="jdt.jdi.jar"/>
-        <fetch dep="jdt.jdimodel.jar"/>
-        <fetch dep="icu"/>
-    </target>
 
     <target name="check-depends">
         <check-one-file src="${jdt.jdi.jar.url}"
@@ -57,11 +36,18 @@
         <check-one-file src="${icu.url}" dest="${icu.jar}" />
     </target>
 
-    <target name="build" depends="check-depends, build-java, build-native" />
+    <target name="fetch-depends">
+        <fetch dep="jdt.jdi.jar"/>
+        <fetch dep="jdt.jdimodel.jar"/>
+        <fetch dep="icu"/>
+    </target>
 
-    <target name="clean" depends="clean-java, clean-native" />
+    <target name="build"
+            depends="check-depends,
+                     -build-jar,-copy-jars,-build-native,
+                     -test-jar" />
 
-    <target name="test" depends="test-module">
+    <target name="test" depends="-test-module">
         <fail message="Some tests failed">
             <condition>
                 <or>
@@ -72,11 +58,60 @@
         </fail>
     </target>
 
-    <!-- Build Java code -->
-    <target name="build-java" depends="compile-java, build-jar, copy-jars" />
+    <!-- internal target for local and global test run sequence -->
+    <target name="-test-module" depends="build,-run-tests" />
+
+    <target name="clean" depends="-clean-java,-clean-native,-clean-test" />
+
+    <target name="-clean-java" unless="skip.java.build">
+        <echo message="Cleaning ${hy.module} classes" />
+
+        <delete file="${hy.jdk}/lib/jdtstub.jar" />
+        <delete file="${hy.jdk}/lib/jdtstub-src.jar" />
+
+        <delete includeemptydirs="true" failonerror="false">
+            <fileset dir="bin/main" />
+            <fileset dir="bin/test" />
+        </delete>
+    </target>
+
+    <target name="-clean-native" unless="skip.native.build"
+            depends="-clean-native-common,-clean-native-windows" />
+
+    <target name="-clean-native-common" unless="skip.native.build">
+        <echo message="Cleaning ${hy.module} natives" />
+        <make dir="src/main/native/jdwp/${hy.os.family}/agent"
+              target="clean">
+            <make-elements>
+                <arg line="TOOLSDLLPATH=${hy.jdk}/jre/bin/" />
+            </make-elements>
+        </make>
+
+        <make dir="src/main/native/jdwp/${hy.os.family}/transport/dt_socket"
+              target="clean">
+            <make-elements>
+                <arg line="TOOLSDLLPATH=${hy.jdk}/jre/bin/" />
+            </make-elements>
+        </make>
+    </target>
+
+    <target name="-clean-native-windows" if="is.windows"
+            unless="skip.native.build">
+        <make dir="src/main/native/jdwp/${hy.os.family}/transport/dt_shmem"
+              target="clean">
+            <make-elements>
+                <arg line="TOOLSDLLPATH=${hy.jdk}/jre/bin/" />
+            </make-elements>
+        </make>
+    </target>
+
+    <target name="-clean-test" unless="skip.test.build">
+        <delete dir="${tests.hdk.dir}" failonerror="false" />
+        <delete failonerror="false" dir="bin/test"/>
+    </target>
 
-    <target name="compile-java">
-        <echo message="Compiling JPDA classes" />
+    <target name="-compile-java" unless="skip.java.build">
+        <echo message="Compiling ${hy.module} classes" />
         <ensure-javac/>
         <mkdir dir="bin/main" />
 
@@ -100,12 +135,13 @@
     </target>
 
     <!-- create jdtstub.jar to resolve JDI implementation dependency -->
-    <target name="build-jar" depends="svn-info">
+    <target name="-build-jar" unless="skip.java.build"
+            depends="svn-info,-compile-java">
         <mkdir dir="${hy.jdk}/lib" />
 
         <hy.jar.bin destfile="${hy.jdk}/lib/jdtstub.jar"
                     manifest="META-INF/MANIFEST.MF">
-            <fileset refid="classes" />
+            <fileset dir="bin/main" />
         </hy.jar.bin>
 
         <hy.jar.src destfile="${hy.jdk}/lib/jdtstub-src.jar">
@@ -113,8 +149,9 @@
         </hy.jar.src>
     </target>
 
-    <!-- copy all required jars with JDI implementation and dependent classes -->
-    <target name="copy-jars">
+    <!-- copy all required jars with JDI implementation and dependent
+         classes -->
+    <target name="-copy-jars" unless="skip.java.build">
         <mkdir dir="${hy.jdk}/lib" />
         <copy todir="${hy.jdk}/lib" flatten="true">
             <fileset file="${icu.jar}"/>
@@ -123,12 +160,12 @@
     </target>
 
     <!-- Build native code -->
-    <target name="build-native"
+    <target name="-build-native" unless="skip.native.build"
             depends="-build-native-common,-build-native-windows" />
 
-    <target name="-build-native-common">
+    <target name="-build-native-common" unless="skip.native.build">
         
-        <echo message="Compiling JPDA natives" />
+        <echo message="Compiling ${hy.module} natives" />
 
         <!-- Build agent shared lib -->
         <make dir="src/main/native/jdwp/${hy.os.family}/agent">
@@ -145,7 +182,8 @@
         </make>
     </target>
 
-    <target name="-build-native-windows" if="is.windows">
+    <target name="-build-native-windows" if="is.windows"
+            unless="skip.native.build">
         <!-- Build shared memory transport shared lib on Windows -->
         <make dir="src/main/native/jdwp/${hy.os.family}/transport/dt_shmem">
             <make-elements>
@@ -155,165 +193,43 @@
 
     </target>
 
-    <!-- internal target for local and global test run sequence -->
-    <target name="test-module" depends="build-tests, prepare-exclude, run-tests" />
+    <target name="-test-jar" unless="skip.test.build"
+            depends="svn-info,-compile-tests">
+        <mkdir dir="${tests.hdk.dir}" />
 
-    <!-- Clean Java -->
-    <target name="clean-java">
-        <echo message="Cleaning JPDA classes" />
+        <copy file="make/run-test.xml" tofile="${tests.hdk.dir}/build.xml" />
 
-        <delete file="${hy.jdk}/lib/jdtstub.jar" />
-        <delete file="${hy.jdk}/lib/jdtstub-src.jar" />
-
-        <delete includeemptydirs="true" failonerror="false">
-            <!--fileset refid="classes" /-->
-            <fileset dir="bin/main" />
+        <hy.jar.bin destfile="${tests.hdk.dir}/${hy.module}_tests.jar">
             <fileset dir="bin/test" />
-        </delete>
-    </target>
-
-    <!-- Clean natives -->
-    <target name="clean-native"
-            depends="-clean-native-common,-clean-native-windows" />
-
-    <target name="-clean-native-common">
-        <echo message="Cleaning JPDA natives" />
-        <make dir="src/main/native/jdwp/${hy.os.family}/agent"
-              target="clean">
-            <make-elements>
-                <arg line="TOOLSDLLPATH=${hy.jdk}/jre/bin/" />
-            </make-elements>
-        </make>
-
-        <make dir="src/main/native/jdwp/${hy.os.family}/transport/dt_socket"
-              target="clean">
-            <make-elements>
-                <arg line="TOOLSDLLPATH=${hy.jdk}/jre/bin/" />
-            </make-elements>
-        </make>
-    </target>
-
-    <target name="-clean-native-windows" if="is.windows">
-        <make dir="src/main/native/jdwp/${hy.os.family}/transport/dt_shmem"
-              target="clean">
-            <make-elements>
-                <arg line="TOOLSDLLPATH=${hy.jdk}/jre/bin/" />
-            </make-elements>
-        </make>
-    </target>
-
-    <!-- Compile JDWP tests always with debug info included -->
-    <target name="build-tests" >
-        <echo message="Compiling JPDA tests" />
-        <ensure-javac/>
-        <mkdir dir="bin/test" />
-        <hy.javac
-            srcdir="src/test/java"
-            destdir="bin/test"
-            sourcepath=""
-            debug="on">
-
-            <!-- HDK class library -->
-            <classpath>
-                <fileset dir="${hy.hdk}/jdk/jre/lib/boot">
-                    <include name="**/*.jar" />
-                    <exclude name="**/*-src.jar" />
-                </fileset>
-            </classpath>
-            
-            <classpath>
-                <pathelement path="${junit.jar}"/>
-            </classpath>
-        </hy.javac>
-    </target>
-
-    <target name="prepare-exclude">
-        <echo message="JPDA exclude list: ${jpda.exclude.file}" />
-        <prepare-exclude-list moduleName="jpda" dir="./make"
-                             result="${jpda.exclude.file}" />
-    </target>
-
-    <target name="run-tests" depends="build-tests, prepare-exclude">
-
-        <property name="test.jre.home" value="${hy.jdk}/jre" />
-        <property name="test.jre.jvm" value="${test.jre.home}/bin/java" />
-        <property name="test.debugger.jvm" value="${test.jre.jvm}" />
-        <property name="test.debuggee.jvm" value="${test.jre.jvm}" />
-	
-        <echo message="Running JPDA tests" />
-        <echo message="  Debugger JVM=${test.debugger.jvm}" />
-        <echo message="  Debuggee JVM=${test.debuggee.jvm}" />
-
-        <mkdir dir="${tests.output}" />
-
-        <junit fork="yes"
-                       forkmode="${hy.test.forkmode}"
-                       timeout="${hy.test.timeout}"
-                       printsummary="withOutAndErr"
-                       errorproperty="test.errors"
-                       failureproperty="test.failures"
-                       showoutput="off"
-                       dir="${tests.output}"
-                       jvm="${test.debugger.jvm}">
-
-            <!-- JVM arguments for debugger process -->
-            <jvmarg line="${hy.test.vmargs}" />
-            
-            <!-- JVM path and arguments for debuggee process -->
-            <jvmarg value="-Djpda.settings.debuggeeJavaPath=${test.debuggee.jvm}" />
-            <jvmarg value="-Djpda.settings.debuggeeVMExtraOptions=${hy.test.vmargs}" />
-
-            <classpath>
-                <pathelement path="bin/test" />
-            </classpath>
-
-            <formatter type="xml" />
-
-            <test name="${test.case}" todir="${tests.output}" if="test.case" />
-
-            <!-- short running tests-->
-            <batchtest todir="${tests.output}" haltonfailure="off" unless="test.case">
-
-                <fileset dir="src/test/java">
-                    <!-- if ${test.case}     -->
-                    <include name="${converted.tc}" if="test.case" />
-
-                    <!-- unless ${test.case} -->
-                    <include name="**/*Test.java" unless="test.case" />
-                    <exclude name="**/org/apache/harmony/jpda/tests/jdwp/MultiSession/*Test.java" unless="test.case" />
-                    <exclude name="**/org/apache/harmony/jpda/tests/jdwp/ThreadReference/StopTest.java" unless="test.case" />
-                    <exclude name="**/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/HoldEventsTest.java" unless="test.case" />
-                    <excludesfile name="${jpda.exclude.file}" unless="test.case" />
-                </fileset>
-            </batchtest>
-
-            <!-- long running tests-->
-            <batchtest todir="${tests.output}" haltonfailure="off" unless="test.case">
-                <fileset dir="src/test/java">
-                    <!-- if ${test.case}     -->
-                    <include name="${converted.tc}" if="test.case" />
-
-                    <!-- unless ${test.case} -->
-                    <include name="**/org/apache/harmony/jpda/tests/jdwp/MultiSession/*Test.java" unless="test.case" />
-                    <include name="**/org/apache/harmony/jpda/tests/jdwp/ThreadReference/StopTest.java" unless="test.case" />
-                    <include name="**/org/apache/harmony/jpda/tests/jdwp/VirtualMachine/HoldEventsTest.java" unless="test.case" />
-                    <excludesfile name="${jpda.exclude.file}" unless="test.case" />
-                </fileset>
-            </batchtest>
-        </junit>
-
-        <antcall target="touch-failures-file" />
-        <antcall target="touch-errors-file" />
+        </hy.jar.bin>
+ 
+        <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>
     </target>
 
-    <target name="touch-failures-file" if="test.failures">
-        <echo file="${tests.output}/test.failures"
-            append="true">jpda${line.separator}</echo>
+    <target name="-compile-tests" unless="skip.test.build">
+        <compile-tests description="${hy.module} tests">
+            <javac-elements>
+                <src>
+                    <pathelement location="src/test/java" />
+                </src>
+                <classpath>
+                    <pathelement path="${hy.jdk}/lib/tools.jar"/>
+                </classpath>
+                <!-- TOFIX: hy.javac debug="on" ? -->
+            </javac-elements>
+        </compile-tests>
     </target>
 
-    <target name="touch-errors-file" if="test.errors">
-        <echo file="${tests.output}/test.errors"
-            append="true">jpda${line.separator}</echo>
+    <target name="-run-tests" depends="-test-jar">
+        <ant dir="${tests.hdk.dir}" target="test-module" />
     </target>
 
 </project>

Added: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/make/run-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/make/run-test.xml?rev=938177&view=auto
==============================================================================
--- harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/make/run-test.xml (added)
+++ harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/make/run-test.xml Mon Apr 26 18:28:04 2010
@@ -0,0 +1,53 @@
+<?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 JDK tools Test" default="test" basedir=".">
+
+    <property name="hy.hdk" location="../../.." />
+    <property name="test.jre.home" location="${hy.hdk}/jdk/jre" />
+    <property file="../test.properties" />
+
+    <property name="work.dir" value=".." />
+    <property name="target.dir" value=".." />
+    <property name="tests.output" location="../report" />
+    <property name="junit.jar" location="../junit.jar" />
+
+    <import file="../../ant/properties.xml" />
+
+    <target name="test" depends="test-module" />
+
+    <target name="test-module" depends="test-jre-vm-info">
+        <property name="test.jre.home" value="${hy.jdk}/jre" />
+        <property name="test.jre.jvm" value="${test.jre.home}/bin/java" />
+        <property name="test.debugger.jvm" value="${test.jre.jvm}" />
+        <property name="test.debuggee.jvm" value="${test.jre.jvm}" />
+
+        <echo message="Running JPDA tests" />
+        <echo message="  Debugger JVM=${test.debugger.jvm}" />
+        <echo message="  Debuggee JVM=${test.debuggee.jvm}" />
+
+        <convert-test-as-class from="test.case" to="converted.tc.class" />
+        <run-hdk-tests module="jpda" jar="jpda_tests.jar">
+            <junit-elements>
+                <!-- JVM path and arguments for debuggee process -->
+                <jvmarg value="-Djpda.settings.debuggeeJavaPath=${test.debuggee.jvm}" />
+                <jvmarg value="-Djpda.settings.debuggeeVMExtraOptions=${hy.test.vmargs}" />
+            </junit-elements>
+        </run-hdk-tests>
+    </target>
+</project>

Propchange: harmony/enhanced/java/branches/mrh/jdktools/modules/jpda/make/run-test.xml
------------------------------------------------------------------------------
    svn:eol-style = native