Re: [Monetdb-developers] [Monetdb-checkins] MonetDB/src/testing Mtest.py.in, , 1.320, 1.321
On Wed, Nov 07, 2007 at 03:44:26PM +0000, Niels Nes wrote:
Update of /cvsroot/monetdb/MonetDB/src/testing In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21513
Modified Files: Mtest.py.in Log Message:
added pythonlibdir (obtained from monetdb-config and monetdb-clients-config) into the PYTHONPATH (in an attempt to fix the problems with tests using MonetSQLdb)
should the respective test do this locally? I recall addint something like this to (some of) the MonetSQLdb tests ... Stefan
Index: Mtest.py.in =================================================================== RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mtest.py.in,v retrieving revision 1.320 retrieving revision 1.321 diff -u -d -r1.320 -r1.321 --- Mtest.py.in 2 Nov 2007 07:31:36 -0000 1.320 +++ Mtest.py.in 7 Nov 2007 15:44:24 -0000 1.321 @@ -102,6 +102,17 @@ import distutils.sysconfig p = _configure(os.path.join('@QXprefix@',distutils.sysconfig.get_python_lib(1,0,""))) sys.path.insert(0, p) + try: + q = GetConfig('monetdb-config', '--pythonlibdir') + p = p + os.pathsep + q + except: + None + try: + q = GetConfig('monetdb-clients-config', '--pythonlibdir') + p = p + os.pathsep + q + p = p + os.pathsep + q + os.sep + 'MonetDB' + except: + None from MonetDB import monet_options if os.environ.has_key('PYTHONPATH'): p = p + os.pathsep + os.environ['PYTHONPATH']
------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Monetdb-checkins mailing list Monetdb-checkins@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
-- | Dr. Stefan Manegold | mailto:Stefan.Manegold@cwi.nl | | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | | The Netherlands | Fax : +31 (20) 592-4312 |
On Wed, Nov 07, 2007 at 04:56:43PM +0100, Stefan Manegold wrote:
On Wed, Nov 07, 2007 at 03:44:26PM +0000, Niels Nes wrote:
Update of /cvsroot/monetdb/MonetDB/src/testing In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21513
Modified Files: Mtest.py.in Log Message:
added pythonlibdir (obtained from monetdb-config and monetdb-clients-config) into the PYTHONPATH (in an attempt to fix the problems with tests using MonetSQLdb)
should the respective test do this locally?
I recall addint something like this to (some of) the MonetSQLdb tests ...
well this should solve all those cases at once (I know its a bit of a hack). Problem is setting PYTHONPATH to late (in the script) isn't helping much. But I guess there is a nice solution (some internal version of pythonpath), but that has to wait till next week (once sjoerd is back). Niels
Stefan
Index: Mtest.py.in =================================================================== RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mtest.py.in,v retrieving revision 1.320 retrieving revision 1.321 diff -u -d -r1.320 -r1.321 --- Mtest.py.in 2 Nov 2007 07:31:36 -0000 1.320 +++ Mtest.py.in 7 Nov 2007 15:44:24 -0000 1.321 @@ -102,6 +102,17 @@ import distutils.sysconfig p = _configure(os.path.join('@QXprefix@',distutils.sysconfig.get_python_lib(1,0,""))) sys.path.insert(0, p) + try: + q = GetConfig('monetdb-config', '--pythonlibdir') + p = p + os.pathsep + q + except: + None + try: + q = GetConfig('monetdb-clients-config', '--pythonlibdir') + p = p + os.pathsep + q + p = p + os.pathsep + q + os.sep + 'MonetDB' + except: + None from MonetDB import monet_options if os.environ.has_key('PYTHONPATH'): p = p + os.pathsep + os.environ['PYTHONPATH']
------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Monetdb-checkins mailing list Monetdb-checkins@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
-- | Dr. Stefan Manegold | mailto:Stefan.Manegold@cwi.nl | | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | | The Netherlands | Fax : +31 (20) 592-4312 |
------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Monetdb-developers mailing list Monetdb-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-developers
-- Niels Nes, Centre for Mathematics and Computer Science (CWI) Kruislaan 413, 1098 SJ Amsterdam, The Netherlands room C0.02, phone ++31 20 592-4098, fax ++31 20 592-4312 url: http://www.cwi.nl/~niels e-mail: Niels.Nes@cwi.nl
participants (2)
-
Niels Nes -
Stefan Manegold