[Mulgara-svn] r657 - branches/mgr-73

[ronald at mulgara.org]

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

Modified:
   branches/mgr-73/common.properties
   branches/mgr-73/common.xml
Log:
Merge r656 from trunk: allow additional arguments to passed to the test server.


Modified: branches/mgr-73/common.properties
===================================================================
--- branches/mgr-73/common.properties	2008-02-24 12:44:58 UTC (rev 656)
+++ branches/mgr-73/common.properties	2008-02-24 12:58:26 UTC (rev 657)
@@ -53,3 +53,5 @@
 # VM argument for component test
 jvm.args=-Xmx512M
 
+# test server arguments; can be set with -Dtest.server.args=... on the command line
+test.server.args=

Modified: branches/mgr-73/common.xml
===================================================================
--- branches/mgr-73/common.xml	2008-02-24 12:44:58 UTC (rev 656)
+++ branches/mgr-73/common.xml	2008-02-24 12:58:26 UTC (rev 657)
@@ -594,6 +594,7 @@
 
       <arg value="-a"/>
       <arg value="${test.dir}"/>
+      <arg line="${test.server.args}"/>
     </exec>
 
     <exec os="SunOS" executable="${scripts.dir}/bg.sh" failonerror="yes">
@@ -611,6 +612,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">
@@ -627,6 +629,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"
@@ -644,6 +647,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 -->