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"/>
