[Mulgara-svn] r656 - trunk

[ronald at mulgara.org]

Author: ronald
Date: 2008-02-24 04:44:58 -0800 (Sun, 24 Feb 2008)
New Revision: 656

Modified:
   trunk/common.properties
   trunk/common.xml
Log:
Allow additional arguments to be passed to the server started for the tests.
This allows, for instance, the ports the server listens on to be changed in
order to avoid conflicts with other apps already running on the same machine.


Modified: trunk/common.properties
===================================================================
--- trunk/common.properties	2008-02-24 09:42:41 UTC (rev 655)
+++ trunk/common.properties	2008-02-24 12:44:58 UTC (rev 656)
@@ -53,3 +53,5 @@
 # VM argument for component test
 jvm.args=-Xmx640M
 
+# test server arguments; can be set with -Dtest.server.args=... on the command line
+test.server.args=

Modified: trunk/common.xml
===================================================================
--- trunk/common.xml	2008-02-24 09:42:41 UTC (rev 655)
+++ trunk/common.xml	2008-02-24 12:44:58 UTC (rev 656)
@@ -530,6 +530,7 @@
 
       <arg value="-a"/>
       <arg value="${test.dir}"/>
+      <arg line="${test.server.args}"/>
     </exec>
 
     <exec os="SunOS" executable="${scripts.dir}/bg.sh" failonerror="yes">
@@ -547,6 +548,7 @@
       <arg value="${dist.dir}/${mulgara.jar}"/> -->
       <arg value="-a"/>
       <arg value="${test.dir}"/>
+      <arg line="${test.server.args}"/>
     </exec>
 
     <exec os="Mac OS X" executable="${scripts.dir}/bg.sh" failonerror="yes">
@@ -563,6 +565,7 @@
       <arg value="${dist.dir}/${mulgara.jar}"/> -->
       <arg value="-a"/>
       <arg value="${test.dir}"/>
+      <arg line="${test.server.args}"/>
     </exec>
 
     <exec os="Windows NT,Windows 2000,Windows XP, Windows 2003"
@@ -580,6 +583,7 @@
       <arg value="${dist.dir}\${mulgara.jar}"/> -->
       <arg value="-a"/>
       <arg value="${test.dir}"/>
+      <arg line="${test.server.args}"/>
     </exec>
 
     <!-- wait for the server to start -->