Forgot to mention:

To make this work properly, you also need to cvs-update & make-install MonetDB to get the latest version of Mtest.py .

Stefan

On Tue, Feb 13, 2007 at 08:03:50PM +0000, Stefan Manegold wrote:

Update of /cvsroot/monetdb/pathfinder/tests/XRpc/Tests In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv9407/tests/XRpc/Tests

Modified Files: Tag: XQuery_0-16 add_dbl.xq.in add_int.xq.in concatStr.xq.in echoAll.xq.in echoVoid.xq.in emptySeq1.xq.in emptySeq2.xq.in emptySeq3.xq.in emptySeq4.xq.in insertNode.xq.in multi_clnt_s00.xq.in multi_clnt_s01.xq.in multi_clnt_s02.xq.in returnAncestor.xq.in returnAncestorOrSelf.xq.in returnChild.xq.in returnDescendant.xq.in returnDescendantOrSelf.xq.in returnFollowing.xq.in returnFollowingSibling.xq.in returnParent.xq.in returnPreceding.xq.in returnPrecedingSibling.xq.in returnSelf.xq.in xrpcConvert.xq.in xrpcConvert2.xq.in xrpcConvert2.xrpcfun2.xq.in xrpcfun.xq Removed Files: Tag: XQuery_0-16 add_dbl.prologue.src add_int.prologue.src concatStr.prologue.src echoAll.prologue.src echoVoid.prologue.src emptySeq1.prologue.src emptySeq2.prologue.src emptySeq3.prologue.src emptySeq4.prologue.src insertNode.prologue.src multi_clnt.prologue.src returnAncestor.prologue.src returnAncestorOrSelf.prologue.src returnChild.prologue.src returnDescendant.prologue.src returnDescendantOrSelf.prologue.src returnFollowing.prologue.src returnFollowingSibling.prologue.src returnParent.prologue.src returnPreceding.prologue.src returnPrecedingSibling.prologue.src returnSelf.prologue.src rpcd_start.mil xrpcConvert.prologue.src xrpcConvert2.prologue.src Log Message:

made XRpc tests work, again:

Not only has "xquery_httpd_port" been renamed into "xrpc_port", but also the defaults have changed: While the former used to default to 48080 on the server side (via MonetDB.conf) and on the client side (hard-wired in the code), the latter now defaults to "" (not set) in MonetDB.conf, and hence to mapi_port+1 in the server code; in the client code, the default is still hard-wired to 48080.

Hence, to make the XRPC tests work, again, in the Mtest enviroment (which dynamically sets mapi_port randomly to avoid conflict between concurrent Mtest runs and/or with other programs that happen to use the default port(s)), we need to also set xrpc_port dynamically (now done by Mtest), and use the dynamically set xrpc_port (via $XRPCPORT) in the respective tests.

Moreover, when module pathfinder is loaded, it now autimatically starts an xrpc-server; hence, we must not try to start a second xrpc-server in the XRPC tests.