You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@river.apache.org by th...@apache.org on 2010/11/25 16:34:11 UTC
svn commit: r1039074 - /incubator/river/jtsk/trunk/qa/build.xml
Author: thobbs
Date: Thu Nov 25 15:34:11 2010
New Revision: 1039074
URL: http://svn.apache.org/viewvc?rev=1039074&view=rev
Log:
Stopped river.home from being overriden so that the correct java-savy path can be used from the ../build.properties file. This helps more jtreg tests pass (on Windows), specifically those that use the HTTPD class.
Modified:
incubator/river/jtsk/trunk/qa/build.xml
Modified: incubator/river/jtsk/trunk/qa/build.xml
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/qa/build.xml?rev=1039074&r1=1039073&r2=1039074&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/qa/build.xml (original)
+++ incubator/river/jtsk/trunk/qa/build.xml Thu Nov 25 15:34:11 2010
@@ -24,8 +24,19 @@
<!-- Root of the River source distribution -->
<property name="root" location=".." />
- <!-- Override this to build/run QA tests against an external River installation -->
- <property name="river.home" location="${root}"/>
+ <!--
+ Override this to build/run QA tests against an external River installation
+
+ This parameter is a problem when running the jtreg tests on windows. river.home
+ becomes the basis for jsk.home which is used in qa/jtreg/net/testlibrary/HTTPD
+ (and maybe other places as well). If this value is left as the default value
+ of root ("..") then the property value becomes something like "C:\path\to\river"
+ When this values eventually finds its way into HTTPD it becomes "Cpathtoriver"
+ which obviously fails to resolve.
+ The way around this is therefore to specific river.home in ../build.properties
+ with the value "C:/path/to/river"
+ -->
+ <!-- <property name="river.home" location="${root}"/> -->
<!-- Import common settings and macros -->
<import file="${root}/common.xml"/>
Re: svn commit: r1039074 - /incubator/river/jtsk/trunk/qa/build.xml
Posted by Sim IJskes - QCG <si...@qcg.nl>.
On 25-11-10 16:47, Tom Hobbs wrote:
> I'm not sure how this helps because river.home was set to some value
> before the common.xml was loaded.
>
> I'm happy for the property to be inherited - and it is (now). The
> problem was it was getting set before the inheritance happened and
> thus it's value was not getting overwritten by the act of inheriting
> common.xml.
Perfect. You can indeed take it out as you did. Its defined in
common.xml anyhow, so it was a duplicate.
But your comment is much more interesting. That means we are too early
making it a 'location' property. I guess its used in httpd as url?
Gr. Sim
--
QCG, Software voor het MKB, 071-5890970, http://www.qcg.nl
Quality Consultancy Group b.v., Leiderdorp, Kvk Den Haag: 28088397
Re: svn commit: r1039074 - /incubator/river/jtsk/trunk/qa/build.xml
Posted by Tom Hobbs <tv...@googlemail.com>.
I'm not sure how this helps because river.home was set to some value
before the common.xml was loaded.
I'm happy for the property to be inherited - and it is (now). The
problem was it was getting set before the inheritance happened and
thus it's value was not getting overwritten by the act of inheriting
common.xml.
What would you suggest? I'm not an Ant magician, I just know enough
to muddle through.
The change is specifically for the jtreg tests. (e.g. "ant jtreg")
On Thu, Nov 25, 2010 at 3:40 PM, Sim IJskes - QCG <si...@qcg.nl> wrote:
> On 25-11-10 16:34, thobbs@apache.org wrote:
>>
>> URL: http://svn.apache.org/viewvc?rev=1039074&view=rev Log: Stopped
>> river.home from being overriden so that the correct java-savy path
>> can be used from the ../build.properties file. This helps more jtreg
>> tests pass (on Windows), specifically those that use the HTTPD
>> class.
>
> I believe you have tried to fix something that is caused by the
> inheritAll=false in the ant call. I did not want to change that, so if you
> want to inherit a property, you can do the same as the harness.generateHtml
> property
>
> <target name="qa.run" depends="" description="Run QA tests">
> <!-- Call qa subcomponent build -->
> <ant dir="qa" target="run" inheritall="false">
> <property name="harness.generateHtml" value="${harness.generateHtml}" />
> </ant>
> </target>
>
> Gr. Sim
>
>
> --
> QCG, Software voor het MKB, 071-5890970, http://www.qcg.nl
> Quality Consultancy Group b.v., Leiderdorp, Kvk Den Haag: 28088397
>
Re: svn commit: r1039074 - /incubator/river/jtsk/trunk/qa/build.xml
Posted by Sim IJskes - QCG <si...@qcg.nl>.
On 25-11-10 16:34, thobbs@apache.org wrote:
> URL: http://svn.apache.org/viewvc?rev=1039074&view=rev Log: Stopped
> river.home from being overriden so that the correct java-savy path
> can be used from the ../build.properties file. This helps more jtreg
> tests pass (on Windows), specifically those that use the HTTPD
> class.
I believe you have tried to fix something that is caused by the
inheritAll=false in the ant call. I did not want to change that, so if
you want to inherit a property, you can do the same as the
harness.generateHtml property
<target name="qa.run" depends="" description="Run QA tests">
<!-- Call qa subcomponent build -->
<ant dir="qa" target="run" inheritall="false">
<property name="harness.generateHtml"
value="${harness.generateHtml}" />
</ant>
</target>
Gr. Sim
--
QCG, Software voor het MKB, 071-5890970, http://www.qcg.nl
Quality Consultancy Group b.v., Leiderdorp, Kvk Den Haag: 28088397