svn commit: r548383 - in /harmony/enhanced/classlib/trunk/modules/luni: build.xml make/hyproperties.xml src/test/api/ src/test/api/common/ src/test/api/unix/ src/test/api/windows/ src/test/java/

[to...@apache.org]

Author: tonywu
Date: Mon Jun 18 08:46:05 2007
New Revision: 548383

URL: http://svn.apache.org/viewvc?view=rev&rev=548383
Log:
restructure source folder for platform specific tests, refer to http://harmony.apache.org/subcomponents/classlibrary/testing.html

Added:
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/
      - copied from r548382, harmony/enhanced/classlib/trunk/modules/luni/src/test/java/
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/unix/
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/windows/
Removed:
    harmony/enhanced/classlib/trunk/modules/luni/src/test/java/
Modified:
    harmony/enhanced/classlib/trunk/modules/luni/build.xml
    harmony/enhanced/classlib/trunk/modules/luni/make/hyproperties.xml

Modified: harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/build.xml?view=diff&rev=548383&r1=548382&r2=548383
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/build.xml Mon Jun 18 08:46:05 2007
@@ -26,6 +26,8 @@
     <!-- set global properties for this build. -->
     <xmlproperty file="make/hyproperties.xml" semanticAttributes="true" />
 
+    <property name="hy.luni.src.test.api.java.platform"
+	    value="${hy.luni.src.test.api}/${hy.os.family}" />
     <fileset id="classes" dir="${hy.build}">
         <or>
             <present targetdir="${hy.luni.src.main.java}" />
@@ -279,7 +281,8 @@
         <compile-tests description="JUnit Tests" destdir="${hy.luni.bin.test}">
             <javac-elements>
                 <src>
-                    <pathelement location="${hy.luni.src.test}/java"/>
+		    <pathelement location="${hy.luni.src.test.api}/common"/>
+	            <pathelement location="${hy.luni.src.test.api.java.platform}"/>
                 </src>
                 <include name="**/*.java" />
             </javac-elements>
@@ -310,7 +313,14 @@
 
 
                 <batchtest todir="${hy.tests.reports}" haltonfailure="no" >
-                    <fileset dir="${hy.luni.src.test}/java">
+                    <fileset dir="${hy.luni.src.test.api}/common">
+                        <!-- if ${test.case}     -->
+                        <include name="${converted.tc}" if="test.case" />
+                        <!-- unless ${test.case} -->
+                        <include name="**/*Test.java" unless="test.case" />
+                        <excludesfile name="${luni.exclude.file}" unless="test.case" />
+                    </fileset>
+                    <fileset dir="${hy.luni.src.test.api.java.platform}">
                         <!-- if ${test.case}     -->
                         <include name="${converted.tc}" if="test.case" />
                         <!-- unless ${test.case} -->

Modified: harmony/enhanced/classlib/trunk/modules/luni/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/hyproperties.xml?view=diff&rev=548383&r1=548382&r2=548383
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/hyproperties.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/hyproperties.xml Mon Jun 18 08:46:05 2007
@@ -27,6 +27,7 @@
         	<resources location="src/main/resources" />
          </main>
          <test location="src/test">
+            <api location="src/test/api" />
             <resources location="src/test/resources" />
          </test>
          <natives location="src/natives" />