Update of /cvsroot/monetdb/MonetDB/src/testing
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23769/MonetDB/src/testing
Modified Files:
Mtest.py.in
Log Message:
conditional "HAVE_MONETDB_JAVA" is no longer sufficient to determine
whether Java/JDBC test can/should be run or not;
hence, we introduce more specific conditionals
"HAVE_MONETDB_JAVAJDBC" & "HAVE_MONETDB_JAVAXRPC" also for testing
and extend monetdb-java-config with options
"--HAVE_MONETDB_JAVAJDBC" & "--HAVE_MONETDB_JAVAXRPC"
to convey the information to other packages
Index: Mtest.py.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mtest.py.in,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -d -r1.327 -r1.328
--- Mtest.py.in 7 Dec 2007 15:46:53 -0000 1.327
+++ Mtest.py.in 11 Dec 2007 22:19:05 -0000 1.328
@@ -155,6 +155,8 @@
'HAVE_MONETDB5' : "@HAVE_MONETDB5_FALSE@",
'HAVE_MONETDB4' : "@HAVE_MONETDB4_FALSE@",
'HAVE_MONETDB_JAVA': "@HAVE_MONETDB_JAVA_FALSE@",
+ 'HAVE_MONETDB_JAVAJDBC': "@HAVE_MONETDB_JAVAJDBC_FALSE@",
+ 'HAVE_MONETDB_JAVAXRPC': "@HAVE_MONETDB_JAVAXRPC_FALSE@",
}
# a bunch of classes to help with generating (X)HTML files
@@ -3020,6 +3022,8 @@
CONDITIONALS['HAVE_MONETDB4'] = '#'
if CheckExec('monetdb-java-config'):
CONDITIONALS['HAVE_MONETDB_JAVA'] = '#'
+ CONDITIONALS['HAVE_MONETDB_JAVAJDBC'] =
GetConfig('monetdb-java-config', '--HAVE_MONETDB_JAVAJDBC')
+ CONDITIONALS['HAVE_MONETDB_JAVAXRPC'] =
GetConfig('monetdb-java-config', '--HAVE_MONETDB_JAVAXRPC')
else:
CONDITIONALS['HAVE_MONETDB_JAVA'] = ''
@@ -3184,6 +3188,8 @@
print "%s = %s" % (v, env[v])
if not quiet:
print "%s = %s" % ('PATH', os.environ['PATH'])
+ if os.environ.has_key('PYTHONPATH'):
+ print "%s = %s" % ('PYTHONPATH', os.environ['PYTHONPATH'])
STDOUT.flush()
# add QUIET par to env
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
