Update of /cvsroot/monetdb/MonetDB/src/testing
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv17628/src/testing
Modified Files:
Mtest.py.in
Log Message:
an attempt to fix the failing JDBC tests on
("oddly configured") SuSE systems (mixing IPv4 & IPv6):
instead of using "localhost", we now (again) use the
actual hostname for all MAPI connections.
Obviously, this requires to set the MAPI port open
(M4: "--set mapi_open=true"; M5: "--set mapi_open=1").
Let's see what testing tells us tomorrow...
Index: Mtest.py.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mtest.py.in,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -d -r1.277 -r1.278
--- Mtest.py.in 29 Apr 2007 17:39:34 -0000 1.277
+++ Mtest.py.in 29 May 2007 16:49:44 -0000 1.278
@@ -2431,14 +2431,14 @@
os.environ['CYGPATH_WP'] = '@CYGPATH_WP@'
HOST = 'localhost'
-#if os.environ.has_key('HOST'):
-# HOST = os.environ['HOST']
+if os.environ.has_key('HOST'):
+ HOST = os.environ['HOST']
#else:
# HOST = ''
-##elif os.name != "nt":
-## HOST = os.uname()[1]
-##elif os.environ.has_key('COMPUTERNAME'):
-## HOST = os.environ['COMPUTERNAME']
+elif os.name != "nt":
+ HOST = os.uname()[1]
+elif os.environ.has_key('COMPUTERNAME'):
+ HOST = os.environ['COMPUTERNAME']
##else:
## HOST = "WIN2000"
HOST = HOST.split('.', 1)[0]
@@ -2972,10 +2972,10 @@
exe = {}
exe['Mtimeout'] = CheckExec('Mtimeout') , 'Mtimeout -timeout
%d ' % par['TIMEOUT']
if env['VERSION'] >= 49900:
- exe['Mserver'] = CheckExec('mserver5') , 'mserver5
"--config=%s" --debug=%s %s %s %s %s --set mapi_port=%s --set xrpc_port=%s
--set monet_prompt= --trace' % \
+ exe['Mserver'] = CheckExec('mserver5') , 'mserver5
"--config=%s" --debug=%s %s %s %s %s --set mapi_open=1 --set mapi_port=%s --set
xrpc_port=%s --set monet_prompt= --trace' % \
(opts.config,
env['GDK_DEBUG'], env['setMONETDB_MOD_PATH'], env['setGDK_DBFARM'],
env['setSQL_LOGDIR'], env['setXQUERY_LOGDIR'], env['MAPIPORT'], env['XRPCPORT'])
else:
- exe['Mserver'] = CheckExec('Mserver') , 'Mserver
"--config=%s" --debug=%s %s %s %s %s --set mapi_port=%s --set xrpc_port=%s
--set monet_prompt= --trace' % \
+ exe['Mserver'] = CheckExec('Mserver') , 'Mserver
"--config=%s" --debug=%s %s %s %s %s --set mapi_open=true --set mapi_port=%s
--set xrpc_port=%s --set monet_prompt= --trace' % \
(opts.config,
env['GDK_DEBUG'], env['setMONETDB_MOD_PATH'], env['setGDK_DBFARM'],
env['setSQL_LOGDIR'], env['setXQUERY_LOGDIR'], env['MAPIPORT'], env['XRPCPORT'])
exe['Mdiff'] = CheckExec('Mdiff') , 'Mdiff'
exe['python'] = CheckExec(sys.executable) , sys.executable
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
