You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@harmony.apache.org by Mark Hindess <ma...@googlemail.com> on 2006/07/06 15:17:11 UTC

Re: 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/

On 6 July 2006 at 12:55, George Harley <ge...@googlemail.com>
wrote:
>
> Hi Mark,
>
> From what I can tell this JIRA hasn't really achieved much apart
> from pushing code around the repository and breaking at least one
> patch (HARMONY-755).

Well, obviously that wasn't my motivation! ;-)

>From the description, it was clear (to me anyway) that the patch was to
enable the use of platform-specific test code.  While the directories
for the platform-specific test code are currently empty, I'm certain
Paulex plans to rectify this pretty soon.

I think Paulex was correct to separate the process of allowing for
platform-specific tests (HARMONY-782) from any JIRA containing new
tests.

The JIRA comment by Paulex mentioned that it would break two existing
JIRA issues - HARMONY-775 and HARMONY-767.  I applied the former but the
latter was already assigned to Tim and marked 'In Progress' so I didn't
feel it was right to steal it.  However I have made the trivial change
to the patch metadata to fix the HARMONY-767 patch.

Unfortunately it didn't mention the HARMONY-775 patch, otherwise I might
have checked with you first.

> It would be great if you or Paulex (and everyone in fact) could
> comment in the "[classlib] Testing conventions - a proposal" thread
> [1] about this.

Certainly - though this seems to me to be orthogonal to the purpose of
the HARMONY-782 patch.

Regards,
 Mark.

> Thanks,
> George
> 
> [1] 
> http://mail-archives.apache.org/mod_mbox/incubator-harmony-dev/200607.mbox/%3c44ABB451.30806@googlemail.com%3e
> 
> 
> 
> hindessm@apache.org wrote:
> > 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/com
> mon/
> >     incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/com
> mon/org/
> >       - copied from r419518, incubator/harmony/enhanced/classlib/trunk/modu
> les/nio/src/test/java/org/
> >     incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/lin
> ux/
> >     incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/win
> dows/
> > 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 (origi
> nal)
> > +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/.classpath Thu Ju
> l  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/window
> s"/>
> > +	<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" pat
> h="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 (origin
> al)
> > +++ 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="n
> o" 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/hyprop
> erties.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" />
> >
> >
> >
> >   
> 
> 
> ---------------------------------------------------------------------
> Terms of use : http://incubator.apache.org/harmony/mailing.html
> To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
> For additional commands, e-mail: harmony-dev-help@incubator.apache.org



---------------------------------------------------------------------
Terms of use : http://incubator.apache.org/harmony/mailing.html
To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
For additional commands, e-mail: harmony-dev-help@incubator.apache.org


Re: 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/

Posted by Paulex Yang <pa...@gmail.com>.
Mark Hindess wrote:
> On 6 July 2006 at 12:55, George Harley <ge...@googlemail.com>
> wrote:
>   
>> Hi Mark,
>>
>> From what I can tell this JIRA hasn't really achieved much apart
>> from pushing code around the repository and breaking at least one
>> patch (HARMONY-755).
>>     
>
> Well, obviously that wasn't my motivation! ;-)
>
> >From the description, it was clear (to me anyway) that the patch was to
> enable the use of platform-specific test code.  While the directories
> for the platform-specific test code are currently empty, I'm certain
> Paulex plans to rectify this pretty soon.
>
> I think Paulex was correct to separate the process of allowing for
> platform-specific tests (HARMONY-782) from any JIRA containing new
> tests.
>
> The JIRA comment by Paulex mentioned that it would break two existing
> JIRA issues - HARMONY-775 and HARMONY-767.  I applied the former but the
> latter was already assigned to Tim and marked 'In Progress' so I didn't
> feel it was right to steal it.  However I have made the trivial change
> to the patch metadata to fix the HARMONY-767 patch.
>
> Unfortunately it didn't mention the HARMONY-775 patch, otherwise I might
> have checked with you first.
>   
Oooops, It's my fault, I was not noticed this reopened one:(... thanks 
Mark again to update that patch.

I really need more coffee these days, fortunately the  WorldCup is going 
to over and I don't need to wake up every 3:00 AM any more! ;-)
>   
>> It would be great if you or Paulex (and everyone in fact) could
>> comment in the "[classlib] Testing conventions - a proposal" thread
>> [1] about this.
>>     
>
> Certainly - though this seems to me to be orthogonal to the purpose of
> the HARMONY-782 patch.
>
> Regards,
>  Mark.
>
>   
>> Thanks,
>> George
>>
>> [1] 
>> http://mail-archives.apache.org/mod_mbox/incubator-harmony-dev/200607.mbox/%3c44ABB451.30806@googlemail.com%3e
>>
>>
>>
>> hindessm@apache.org wrote:
>>     
>>> 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/com
>>>       
>> mon/
>>     
>>>     incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/com
>>>       
>> mon/org/
>>     
>>>       - copied from r419518, incubator/harmony/enhanced/classlib/trunk/modu
>>>       
>> les/nio/src/test/java/org/
>>     
>>>     incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/lin
>>>       
>> ux/
>>     
>>>     incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/win
>>>       
>> dows/
>>     
>>> 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 (origi
>>>       
>> nal)
>>     
>>> +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/.classpath Thu Ju
>>>       
>> l  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/window
>>>       
>> s"/>
>>     
>>> +	<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" pat
>>>       
>> h="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 (origin
>>>       
>> al)
>>     
>>> +++ 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="n
>>>       
>> o" 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/hyprop
>>>       
>> erties.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" />
>>>
>>>
>>>
>>>   
>>>       
>> ---------------------------------------------------------------------
>> Terms of use : http://incubator.apache.org/harmony/mailing.html
>> To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
>> For additional commands, e-mail: harmony-dev-help@incubator.apache.org
>>     
>
>
>
> ---------------------------------------------------------------------
> Terms of use : http://incubator.apache.org/harmony/mailing.html
> To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
> For additional commands, e-mail: harmony-dev-help@incubator.apache.org
>
>
>   


-- 
Paulex Yang
China Software Development Lab
IBM



---------------------------------------------------------------------
Terms of use : http://incubator.apache.org/harmony/mailing.html
To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
For additional commands, e-mail: harmony-dev-help@incubator.apache.org


Re: 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/

Posted by George Harley <ge...@googlemail.com>.
Mark Hindess wrote:
> On 6 July 2006 at 12:55, George Harley <ge...@googlemail.com>
> wrote:
>   
>> Hi Mark,
>>
>> From what I can tell this JIRA hasn't really achieved much apart
>> from pushing code around the repository and breaking at least one
>> patch (HARMONY-755).
>>     
>
> Well, obviously that wasn't my motivation! ;-)
>
>   

Hi Mark,

No one was saying it was. BTW, good to hear you have some motivation :-)


> >From the description, it was clear (to me anyway) that the patch was to
> enable the use of platform-specific test code.  While the directories
> for the platform-specific test code are currently empty, I'm certain
> Paulex plans to rectify this pretty soon.
>
>   

Creating empty directories is not the issue here. The patch also 
entailed moving a whole bunch of other files around the source tree for 
reasons that are  currently being discussed in the dev list.

> I think Paulex was correct to separate the process of allowing for
> platform-specific tests (HARMONY-782) from any JIRA containing new
> tests.
>   

The "process" of allowing for new platform-specific tests is precisely 
what is being currently discussed on the dev-list in the referenced thread.

> The JIRA comment by Paulex mentioned that it would break two existing
> JIRA issues - HARMONY-775 and HARMONY-767.  I applied the former but the
> latter was already assigned to Tim and marked 'In Progress' so I didn't
> feel it was right to steal it.  However I have made the trivial change
> to the patch metadata to fix the HARMONY-767 patch.
>
> Unfortunately it didn't mention the HARMONY-775 patch, otherwise I might
> have checked with you first.
>
>   

It was HARMONY-755. I know, now I'm just being picky :-)

>> It would be great if you or Paulex (and everyone in fact) could
>> comment in the "[classlib] Testing conventions - a proposal" thread
>> [1] about this.
>>     
>
> Certainly - though this seems to me to be orthogonal to the purpose of
> the HARMONY-782 patch.
>
> Regards,
>  Mark.
>
>   

The summary of HARMONY-782 is "Relayout NIO test cases to platform 
dependent". That is orthogonal to the dev-list discussion on proposed 
test layout ??? Are you serious ??????

Best regards,
George


>> Thanks,
>> George
>>
>> [1] 
>> http://mail-archives.apache.org/mod_mbox/incubator-harmony-dev/200607.mbox/%3c44ABB451.30806@googlemail.com%3e
>>
>>
>>
>> hindessm@apache.org wrote:
>>     
>>> 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/com
>>>       
>> mon/
>>     
>>>     incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/com
>>>       
>> mon/org/
>>     
>>>       - copied from r419518, incubator/harmony/enhanced/classlib/trunk/modu
>>>       
>> les/nio/src/test/java/org/
>>     
>>>     incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/lin
>>>       
>> ux/
>>     
>>>     incubator/harmony/enhanced/classlib/trunk/modules/nio/src/test/java/win
>>>       
>> dows/
>>     
>>> 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 (origi
>>>       
>> nal)
>>     
>>> +++ incubator/harmony/enhanced/classlib/trunk/modules/nio/.classpath Thu Ju
>>>       
>> l  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/window
>>>       
>> s"/>
>>     
>>> +	<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" pat
>>>       
>> h="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 (origin
>>>       
>> al)
>>     
>>> +++ 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="n
>>>       
>> o" 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/hyprop
>>>       
>> erties.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" />
>>>
>>>
>>>
>>>   
>>>       
>> ---------------------------------------------------------------------
>> Terms of use : http://incubator.apache.org/harmony/mailing.html
>> To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
>> For additional commands, e-mail: harmony-dev-help@incubator.apache.org
>>     
>
>
>
> ---------------------------------------------------------------------
> Terms of use : http://incubator.apache.org/harmony/mailing.html
> To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
> For additional commands, e-mail: harmony-dev-help@incubator.apache.org
>
>
>   


---------------------------------------------------------------------
Terms of use : http://incubator.apache.org/harmony/mailing.html
To unsubscribe, e-mail: harmony-dev-unsubscribe@incubator.apache.org
For additional commands, e-mail: harmony-dev-help@incubator.apache.org