Return-Path: 
 <commits-return-50727-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org>
Delivered-To: apmail-harmony-commits-archive@www.apache.org
Received: (qmail 49805 invoked from network); 9 Feb 2008 14:10:18 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 9 Feb 2008 14:10:18 -0000
Received: (qmail 14824 invoked by uid 500); 9 Feb 2008 14:10:11 -0000
Delivered-To: apmail-harmony-commits-archive@harmony.apache.org
Received: (qmail 14807 invoked by uid 500); 9 Feb 2008 14:10:11 -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 14798 invoked by uid 99); 9 Feb 2008 14:10:11 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Feb 2008 06:10:11 -0800
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.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Feb 2008 14:09:49 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 175EB1A9832; Sat,  9 Feb 2008 06:09:57 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r620118 - in
 /harmony/enhanced/classlib/trunk/modules/awt:
 build.xml make/hyproperties.xml
Date: Sat, 09 Feb 2008 14:09:56 -0000
To: commits@harmony.apache.org
From: apavlenko@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080209140957.175EB1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: apavlenko
Date: Sat Feb  9 06:09:56 2008
New Revision: 620118

URL: http://svn.apache.org/viewvc?rev=620118&view=rev
Log:
Missed patches for build files. HARMONY-5451: [classlib][awt] reordering awt tests according to the testing convention

Modified:
    harmony/enhanced/classlib/trunk/modules/awt/build.xml
    harmony/enhanced/classlib/trunk/modules/awt/make/hyproperties.xml

Modified: harmony/enhanced/classlib/trunk/modules/awt/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/build.xml?rev=620118&r1=620117&r2=620118&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/build.xml Sat Feb  9 06:09:56 2008
@@ -29,8 +29,8 @@
     <property name="hy.awt.src.main.java.platform"
               value="${hy.awt.src.main.java}/../${hy.os.family}" />
 
-    <property name="hy.awt.src.test.api.java.platform"
-              value="${hy.awt.src.test.api}/java/${hy.os.family}" />
+    <property name="hy.awt.src.test.impl.platform"
+              value="${hy.awt.src.test.impl}/${hy.os.family}" />
 
     <fileset id="classes" dir="${hy.build}">
         <or>
@@ -109,11 +109,6 @@
 
     <target name="copy-resources" depends="-copy-win-resources">
         <mkdir dir="${hy.build}" />
-        <copy todir="${hy.build}" includeemptydirs="false">
-            <fileset dir="${hy.awt.src.main.java}">
-                <exclude name="**/*.java" />
-            </fileset>
-        </copy>
 
         <mkdir dir="${hy.jdk}/jre/lib/cmm" />
         <copy todir="${hy.jdk}/jre/lib/cmm">
@@ -317,9 +312,31 @@
     <target name="compile-tests" depends="copy-test-resources">
         <echo message="Compiling AWT tests" />
 
-        <mkdir dir="${hy.awt.bin.test}" />
+        <mkdir dir="${hy.awt.bin.test.boot}" />
+        <javac destdir="${hy.awt.bin.test.boot}"
+               sourcepath=""
+               compiler="${hy.javac.compiler}"
+               memoryMaximumSize="${hy.javac.maxmem}"
+               source="${hy.javac.source}" 
+               target="${hy.javac.target}"
+               debug="${hy.javac.debug}">
+
+            <compilerarg line="${build.compilerarg}" />
 
-        <javac destdir="${hy.awt.bin.test}"
+            <src>
+                <pathelement location="${hy.awt.src.test.impl.boot}" />
+            </src>
+               
+            <bootclasspath>
+                <fileset dir="${hy.jdk}/jre/lib/boot">
+                    <include name="**/*.jar" />
+                </fileset>
+            </bootclasspath>
+            <classpath location="${basedir}/../../${junit.jar}" />
+        </javac>
+
+        <mkdir dir="${hy.awt.bin.test.classes}" />
+        <javac destdir="${hy.awt.bin.test.classes}"
                sourcepath=""
                compiler="${hy.javac.compiler}"
                memoryMaximumSize="${hy.javac.maxmem}"
@@ -330,8 +347,8 @@
             <compilerarg line="${build.compilerarg}" />
 
             <src>
-                <pathelement location="${hy.awt.src.test.api}/java/common" />
-                <pathelement location="${hy.awt.src.test.api.java.platform}" />
+                <pathelement location="${hy.awt.src.test.api.java}" />
+                <pathelement location="${hy.awt.src.test.impl.platform}" />
             </src>
                
             <bootclasspath>
@@ -339,36 +356,15 @@
                     <include name="**/*.jar" />
                 </fileset>
             </bootclasspath>
-            <classpath location="../../build/tests" />
+            <classpath location="${basedir}/../../${junit.jar}" />
         </javac>
-        <!--mkdir dir="${hy.awt.src.test.api}/java/common/java/awt/geom/shapes" />
-        <copy todir="${hy.awt.bin.test}/java/awt/geom/shapes" overwrite="yes">
-            <fileset dir="${hy.awt.src.test.api}/java/common/java/awt/geom/shapes" />
-        </copy>
-        <mkdir dir="${hy.awt.src.test.api}/java/common/java/awt/geom/serialization" />
-        <copy todir="${hy.awt.bin.test}/java/awt/geom/serialization" overwrite="yes">
-            <fileset dir="${hy.awt.src.test.api}/java/common/java/awt/geom/serialization" />
-        </copy>
-        <mkdir dir="${hy.awt.src.test.api}/java/common/java/awt/shapes" />
-        <copy todir="${hy.awt.bin.test}/java/awt/shapes" overwrite="yes">
-            <fileset dir="${hy.awt.src.test.api}/java/common/java/awt/shapes" />
-        </copy>
-        <mkdir dir="${hy.awt.src.test.api}/java/common/java/java/serialization" />
-        <copy todir="${hy.awt.bin.test}/java/awt/serialization" overwrite="yes">
-            <fileset dir="${hy.awt.src.test.api}/java/common/java/awt/serialization" />
-        </copy>    
-        <mkdir dir="${hy.awt.src.test.api}/java/common/org/apache/harmony/awt/gl/resources" />
-        <copy todir="${hy.awt.bin.test}/org/apache/harmony/awt/gl/resources" overwrite="yes">
-            <fileset dir="${hy.awt.src.test.api}/java/common/org/apache/harmony/awt/gl/resources" />
-        </copy-->    
+
     </target>
 
     <target name="copy-test-resources">
-        <mkdir dir="${hy.awt.bin.test}" />
-        <copy todir="${hy.awt.bin.test}" includeemptydirs="false">
-            <fileset dir="${hy.awt.src.test.resources}">
-                <exclude name="**/*.java" />
-            </fileset>
+        <mkdir dir="${hy.awt.bin.test.resources}" />
+        <copy todir="${hy.awt.bin.test.resources}" includeemptydirs="false">
+            <fileset dir="${hy.awt.src.test.api.resources}" />
         </copy>
     </target>
 
@@ -378,11 +374,10 @@
     </target>
 
     <target name="run-tests">
-
         <mkdir dir="${hy.tests.reports}" />
-
         <property name="test.jre.home" value="${hy.jdk}/jre" />
 
+        <!-- bootclasspath tests -->
         <junit fork="yes"
                forkmode="${hy.test.forkmode}"
                timeout="${hy.test.timeout}"
@@ -394,36 +389,53 @@
                jvm="${test.jre.home}/bin/java">
 
             <jvmarg line="${hy.test.vmargs}" />
-
-            <jvmarg value="-DTEST_SRC_DIR=${hy.awt.bin.test}"/>
-<!--            <jvmarg value="-Djava2d.opengl=true"/> -->
-            <jvmarg value="-Xbootclasspath/a:${hy.awt.bin.test}${path.separator}${basedir}/../../${junit.jar}"/>
+            <jvmarg value="-Xbootclasspath/a:${hy.awt.bin.test.boot}${path.separator}${basedir}/../../${junit.jar}"/>
 
             <formatter type="xml" />
 
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
-
-                <!-- if ${test.case} -->
-                <fileset dir="${hy.awt.src.test.api}/java/common">
+            <batchtest todir="${hy.tests.reports}" haltonfailure="no">
+                <fileset dir="${hy.awt.src.test.impl.boot}">
                     <include name="${converted.tc}" if="test.case" />
+                    <include name="**/*Test.java" unless="test.case" />
+                    <excludesfile name="${awt.exclude.file}" unless="test.case" />
+                    <exclude name="**/*Headless*Test.java" />
                 </fileset>
-                <fileset dir="${hy.awt.src.test.api.java.platform}">
+            </batchtest>
+        </junit>
+
+        <!-- classpath tests -->
+        <junit fork="yes"
+               forkmode="${hy.test.forkmode}"
+               timeout="${hy.test.timeout}"
+               printsummary="withOutAndErr"
+               errorproperty="test.errors"
+               failureproperty="test.failures"
+               showoutput="on"
+               dir="${basedir}"
+               jvm="${test.jre.home}/bin/java">
+
+            <jvmarg line="${hy.test.vmargs}" />
+            <classpath location="${hy.awt.bin.test.classes}" />
+
+            <formatter type="xml" />
+
+            <batchtest todir="${hy.tests.reports}">
+                <fileset dir="${hy.awt.src.test.api.java}">
                     <include name="${converted.tc}" if="test.case" />
-                </fileset>
-                <!-- unless ${test.case} -->
-                <fileset dir="${hy.awt.src.test.api}/java/common">
                     <include name="**/*Test.java" unless="test.case" />
+                    <exclude name="**/*Headless*Test.java" unless="test.case" />
                     <excludesfile name="${awt.exclude.file}" unless="test.case"/>
-                    <exclude name="**/*Headless*Test.java"/>
                 </fileset>
-                <fileset dir="${hy.awt.src.test.api.java.platform}">
+                <fileset dir="${hy.awt.src.test.impl.platform}">
+                    <include name="${converted.tc}" if="test.case" />
                     <include name="**/*Test.java" unless="test.case" />
+                    <exclude name="**/*Headless*Test.java" unless="test.case" />
                     <excludesfile name="${awt.exclude.file}" unless="test.case"/>
-                    <exclude name="**/*Headless*Test.java"/>
                 </fileset>
             </batchtest>  
         </junit>
 
+        <!-- headless tests, should be moved to classpath -->
         <junit fork="yes"
                forkmode="${hy.test.forkmode}"
                timeout="${hy.test.timeout}"
@@ -435,20 +447,19 @@
                jvm="${test.jre.home}/bin/java">
 
             <jvmarg line="${hy.test.vmargs}" />
-
-            <jvmarg value="-DTEST_SRC_DIR=${hy.awt.bin.test}"/>
             <jvmarg value="-Djava.awt.headless=true"/>
-            <jvmarg value="-Xbootclasspath/a:${hy.awt.bin.test}${path.separator}${basedir}/../../${junit.jar}"/>
+            <jvmarg value="-Xbootclasspath/a:${hy.awt.bin.test.boot}${path.separator}${basedir}/../../${junit.jar}"/>
 
             <formatter type="xml" />
 
             <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
-
-                <fileset dir="${hy.awt.src.test.api}/java/common">
+                <fileset dir="${hy.awt.src.test.impl.boot}">
+                    <include name="${converted.tc}" if="test.case" />
                     <include name="**/*Headless*Test.java" unless="test.case" />
                     <excludesfile name="${awt.exclude.file}" unless="test.case"/>
                 </fileset>
-                <fileset dir="${hy.awt.src.test.api.java.platform}">
+                <fileset dir="${hy.awt.src.test.impl.platform}">
+                    <include name="${converted.tc}" if="test.case" />
                     <include name="**/*Headless*Test.java" unless="test.case" />
                     <excludesfile name="${awt.exclude.file}" unless="test.case"/>
                 </fileset>

Modified: harmony/enhanced/classlib/trunk/modules/awt/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/awt/make/hyproperties.xml?rev=620118&r1=620117&r2=620118&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/awt/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/awt/make/hyproperties.xml Sat Feb  9 06:09:56 2008
@@ -17,32 +17,42 @@
 -->
 
 <hy>
-   <awt location=".">
-      <src>
-         <main>
-            <java location="src/main/java/common" />
-            <native location="src/main/native" />
-            <resources location="src/main/resources" />
-         </main>
-         <test>
-            <api location="src/test/api" />
-            <resources location="src/test/api/resources" />
-         </test>
-         <natives location="src/natives" />
-      </src>
-      <bin>
-        <main location="bin/main" />
-        <test location="bin/test" />
-      </bin>
-      <packaging>
-      </packaging>
-   </awt>
-
-   <hdk location="../../deploy" />
-   <jdk location="../../deploy/jdk" />
-   <build location="../../build/classes" />
-
-   <tests>
-      <reports location="../../build/test_report" />
-   </tests>
+    <awt location=".">
+        <src>
+            <main>
+                <java location="src/main/java/common"/>
+                <native location="src/main/native"/>
+                <resources location="src/main/resources"/>
+            </main>
+            <test>
+                <api>
+                    <java location="src/test/api/java"/>
+                    <resources location="src/test/api/resources"/>
+                </api>
+                <impl location="src/test/impl">
+                    <boot location="src/test/impl/boot"/>
+                    <resources location="src/test/impl/resources"/>
+                    <native location="src/test/impl/native"/>
+                </impl>
+            </test>
+        </src>
+        <bin>
+            <main location="bin/main"/>
+            <test>
+                <resources location="bin/test/resources"/>
+                <classes location="bin/test/classes"/>
+                <boot location="bin/test/boot"/>
+            </test>
+        </bin>
+        <packaging>
+        </packaging>
+    </awt>
+    
+    <hdk location="../../deploy"/>
+    <jdk location="../../deploy/jdk"/>
+    <build location="../../build/classes"/>
+    
+    <tests>
+        <reports location="../../build/test_report"/>
+    </tests>
 </hy>