harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r419522 - in /incubator/harmony/enhanced/classlib/trunk/modules/nio: .classpath build.xml make/hyproperties.xml src/test/java/common/ src/test/java/common/org/ src/test/java/linux/ src/test/java/org/ src/test/java/windows/
Date Thu, 06 Jul 2006 11:20:28 GMT
Author: hindessm
Date: Thu Jul  6 04:20:27 2006
New Revision: 419522

URL: http://svn.apache.org/viewvc?rev=419522&view=rev
Log:
Applied changes for "[#HARMONY-782] [classlib][nio]Relayout NIO test cases to platform dependent".

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/common/
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/common/org/
      - copied from r419518, incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/linux/
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/windows/
Removed:
    incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/org/
Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/nio/.classpath
    incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml
    incubator/harmony/enhanced/classlib/trunk/modules/nio/make/hyproperties.xml

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/.classpath
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/.classpath?rev=419522&r1=419521&r2=419522&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/.classpath (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/.classpath Thu Jul  6 04:20:27 2006
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry output="bin/main" kind="src" path="src/main/java"/>
-	<classpathentry output="bin/test" kind="src" path="src/test/java"/>
+	<classpathentry output="bin/test" kind="src" path="src/test/java/common"/>
+	<classpathentry output="bin/test" kind="src" path="src/test/java/windows"/>
+	<classpathentry output="bin/test" kind="src" path="src/test/java/linux"/>
 	<classpathentry output="bin/test" kind="src" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry sourcepath="JUNIT_SRC_HOME/junitsrc.zip" kind="var" path="JUNIT_HOME/junit.jar"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml?rev=419522&r1=419521&r2=419522&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/build.xml Thu Jul  6 04:20:27 2006
@@ -35,6 +35,9 @@
 	     use the Eclipse Java compiler. -->
 	<property name="build.compiler" value="modern" />
 
+        <property name="hy.nio.src.test.java.platform"
+                  value="${hy.nio.src.test.java}/../${hy.os}" />
+
 	<target name="build" depends="compile.java, build.jar" />
 
 	<target name="test" depends="build, compile.tests, run.tests" />
@@ -108,19 +111,23 @@
 
 		<mkdir dir="${hy.nio.bin.test}" />
 
-		<javac srcdir="${hy.nio.src.test.java}"
-			destdir="${hy.nio.bin.test}"
-			sourcepath=""
-			source="${hy.javac.source}"
-			target="${hy.javac.target}"
-			debug="${hy.javac.debug}">
-
-			<bootclasspath>
-				<fileset dir="${hy.jdk}/jre/lib/boot">
-					<include name="**/*.jar" />
-				</fileset>
-			</bootclasspath>
-			<classpath location="${hy.hdk}/build/test/support.jar" />
+		<javac destdir="${hy.nio.bin.test}"
+		       sourcepath=""
+		       source="${hy.javac.source}"
+		       target="${hy.javac.target}"
+		       debug="${hy.javac.debug}">
+
+                    <src>
+                        <pathelement location="${hy.nio.src.test.java}"/>
+                        <pathelement
+                             location="${hy.nio.src.test.java.platform}"/>
+                    </src>
+		    <bootclasspath>
+			<fileset dir="${hy.jdk}/jre/lib/boot">
+			    <include name="**/*.jar" />
+			</fileset>
+		    </bootclasspath>
+		    <classpath location="${hy.hdk}/build/test/support.jar" />
 		</javac>
 	</target>
 
@@ -153,6 +160,9 @@
 
 			<batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
 				<fileset dir="${hy.nio.src.test.java}">
+					<include name="**/*Test.java" />
+				</fileset>
+				<fileset dir="${hy.nio.src.test.java.platform}">
 					<include name="**/*Test.java" />
 				</fileset>
 			</batchtest>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/nio/make/hyproperties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/nio/make/hyproperties.xml?rev=419522&r1=419521&r2=419522&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/nio/make/hyproperties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/nio/make/hyproperties.xml Thu Jul  6
04:20:27 2006
@@ -20,11 +20,11 @@
       <src>
          <main>
             <java location="src/main/java" />
-        	<resources location="src/main/resources" />
-        	<native location="src/main/native" />
+            <resources location="src/main/resources" />
+            <native location="src/main/native" />
          </main>
          <test>
-            <java location="src/test/java" />
+            <java location="src/test/java/common" />
             <resources location="src/test/resources" />
          </test>
          <natives location="src/natives" />



Mime
View raw message