Update of /cvsroot/monetdb/sql/src/test/mapi/Tests
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22869/sql/src/test/mapi/Tests
Modified Files:
Tag: SQL_2-20
python_dbapi_embedded.bat python_dbapi_embedded.sh
Log Message:
make sure the tests find moentdb(5).py
also in case sql uses a different prefix than MonetDB and/or clients.
Index: python_dbapi_embedded.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/python_dbapi_embedded.bat,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- python_dbapi_embedded.bat 24 Oct 2007 12:31:17 -0000 1.1.2.2
+++ python_dbapi_embedded.bat 28 Oct 2007 10:50:56 -0000 1.1.2.3
@@ -2,7 +2,7 @@
set PATH=%CLIENTS_PREFIX%\lib\MonetDB\Tests;%PATH%
-set
PYTHONPATH=%MONETDB_PREFIX%\%PYTHON_LIBDIR%;%CLIENTS_PREFIX%\%PYTHON_LIBDIR%;%CLIENTS_PREFIX%\%PYTHON_LIBDIR%\MonetDB;%PYTHONPATH%
+set
PYTHONPATH=%MONETDB_PREFIX%\%PYTHON_LIBDIR%;%CLIENTS_PREFIX%\%PYTHON_LIBDIR%;%CLIENTS_PREFIX%\%PYTHON_LIBDIR%\MonetDB;%SQL_PREFIX%\%PYTHON_LIBDIR%;%PYTHONPATH%
set v=4
if "%TST_FIVE%" == "Five" set v=5
Index: python_dbapi_embedded.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/python_dbapi_embedded.sh,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -d -r1.1.2.3 -r1.1.2.4
--- python_dbapi_embedded.sh 24 Oct 2007 12:31:18 -0000 1.1.2.3
+++ python_dbapi_embedded.sh 28 Oct 2007 10:51:01 -0000 1.1.2.4
@@ -3,7 +3,7 @@
PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
export PATH
-PYTHONPATH="`monetdb-config --pythonlibdir`:`monetdb-clients-config
--pythonlibdir`:`monetdb-clients-config --pythonlibdir`/MonetDB:$PYTHONPATH"
+PYTHONPATH="`monetdb-config --pythonlibdir`:`monetdb-clients-config
--pythonlibdir`:`monetdb-clients-config
--pythonlibdir`/MonetDB:`monetdb-sql-config --pythonlibdir`:$PYTHONPATH"
export PYTHONPATH
if [ -n "$TST_FIVE" ] ; then
-------------------------------------------------------------------------
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-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
