Update of /cvsroot/monetdb/sql/src/test/mapi/Tests
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5176/sql/src/test/mapi/Tests
Modified Files:
Tag: SQL_2-20
python_dbapi_embedded.bat python_dbapi_embedded.sh
python_dbapi.SQL.bat python_dbapi.SQL.sh
Log Message:
attempt to fix
[ 1819168 ] sql/src/test/mapi/python_dbapi test fails
http://sourceforge.net/tracker/index.php?func=detail&aid=1819168&group_id=56967&atid=482468
extended PYTHONPATH to find CMapi in clients-prefix
in case clients-prefix differs from MonetDB-prefix.
Index: python_dbapi_embedded.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/python_dbapi_embedded.bat,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- python_dbapi_embedded.bat 21 Oct 2007 16:48:17 -0000 1.1.2.1
+++ python_dbapi_embedded.bat 24 Oct 2007 12:31:17 -0000 1.1.2.2
@@ -2,7 +2,7 @@
set PATH=%CLIENTS_PREFIX%\lib\MonetDB\Tests;%PATH%
-set PYTHONPATH=%CLIENTS_PREFIX%\%PYTHON_LIBDIR%
+set
PYTHONPATH=%MONETDB_PREFIX%\%PYTHON_LIBDIR%;%CLIENTS_PREFIX%\%PYTHON_LIBDIR%;%CLIENTS_PREFIX%\%PYTHON_LIBDIR%\MonetDB;%PYTHONPATH%
set v=4
if "%TST_FIVE%" == "Five" set v=5
Index: python_dbapi.SQL.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/python_dbapi.SQL.sh,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- python_dbapi.SQL.sh 20 Oct 2007 20:27:13 -0000 1.1.2.1
+++ python_dbapi.SQL.sh 24 Oct 2007 12:31:18 -0000 1.1.2.2
@@ -3,7 +3,7 @@
PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
export PATH
-PYTHONPATH="`monetdb-clients-config --pythonlibdir`"
+PYTHONPATH="`monetdb-config --pythonlibdir`:`monetdb-clients-config
--pythonlibdir`:`monetdb-clients-config --pythonlibdir`/MonetDB:$PYTHONPATH"
export PYTHONPATH
Mlog -x sqlsample.py $MAPIPORT $TSTDB
Index: python_dbapi.SQL.bat
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/python_dbapi.SQL.bat,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- python_dbapi.SQL.bat 20 Oct 2007 20:27:12 -0000 1.1.2.1
+++ python_dbapi.SQL.bat 24 Oct 2007 12:31:18 -0000 1.1.2.2
@@ -2,6 +2,6 @@
set PATH=%CLIENTS_PREFIX%\lib\MonetDB\Tests;%PATH%
-set PYTHONPATH=%CLIENTS_PREFIX%\%PYTHON_LIBDIR%
+set
PYTHONPATH=%MONETDB_PREFIX%\%PYTHON_LIBDIR%;%CLIENTS_PREFIX%\%PYTHON_LIBDIR%;%CLIENTS_PREFIX%\%PYTHON_LIBDIR%\MonetDB;%PYTHONPATH%
call Mlog.bat -x sqlsample.py %MAPIPORT% %TSTDB%
Index: python_dbapi_embedded.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/python_dbapi_embedded.sh,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.sh 21 Oct 2007 17:04:07 -0000 1.1.2.2
+++ python_dbapi_embedded.sh 24 Oct 2007 12:31:18 -0000 1.1.2.3
@@ -3,7 +3,7 @@
PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
export PATH
-PYTHONPATH="`monetdb-clients-config --pythonlibdir`"
+PYTHONPATH="`monetdb-config --pythonlibdir`:`monetdb-clients-config
--pythonlibdir`:`monetdb-clients-config --pythonlibdir`/MonetDB:$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
