Update of /cvsroot/monetdb/sql/src/test/mapi/Tests
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30301/sql/src/test/mapi/Tests
Modified Files:
Tag: SQL_2-20
All python_dbapi_embedded.sh
Log Message:
final attempt to make python_dbapi_embedded test work:
to find module sql[_server] in "weird" places (e.g.,
during `make check`/`sh RunMtest` or in case sql uses a
different prefix than MonetDB[45] as with nightly testing),
we now temporarly patch MonetDB/monetdb5.conf
to set "monet_mod_path=$MONETDB_MOD_PATH"
Caveat:
Don't know how to do this (easily) on Windows;
hence, non-Windows, only.
Index: python_dbapi_embedded.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/python_dbapi_embedded.sh,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- python_dbapi_embedded.sh 19 Nov 2007 08:18:25 -0000 1.1.2.6
+++ python_dbapi_embedded.sh 23 Nov 2007 08:04:01 -0000 1.1.2.7
@@ -7,13 +7,19 @@
export PYTHONPATH
if [ -n "$TST_FIVE" ] ; then
- PYTHONPATH="$TSTBLDBASE/src/backends/monet5/:$PYTHONPATH"
- PYTHONPATH="$TSTBLDBASE/src/backends/monet5/.libs:$PYTHONPATH"
- export PYTHONPATH
- Mlog -x "sqlsample.py $GDK_DBFARM $TSTDB 5"
+ v=5
+ c=`monetdb$v-config --sysconfdir`/monetdb5.conf
else
- PYTHONPATH="$TSTBLDBASE/src/backends/monet4/:$PYTHONPATH"
- PYTHONPATH="$TSTBLDBASE/src/backends/monet4/.libs:$PYTHONPATH"
- export PYTHONPATH
- Mlog -x "sqlsample.py $GDK_DBFARM $TSTDB 4"
+ v=4
+ c=`monetdb$v-config --sysconfdir`/MonetDB.conf
fi
+PYTHONPATH="$TSTBLDBASE/src/backends/monet$v/:$PYTHONPATH"
+PYTHONPATH="$TSTBLDBASE/src/backends/monet$v/.libs:$PYTHONPATH"
+export PYTHONPATH
+# make sure we find module sql[_server]
+sed -i.BAK -e "s|^monet_mod_path=.*$|monet_mod_path=$MONETDB_MOD_PATH|" $c
+
+Mlog -x "sqlsample.py $GDK_DBFARM $TSTDB $v"
+
+# clean-up
+mv -f $c.BAK $c
Index: All
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/All,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -d -r1.1.2.7 -r1.1.2.8
--- All 21 Nov 2007 11:07:44 -0000 1.1.2.7
+++ All 23 Nov 2007 08:04:01 -0000 1.1.2.8
@@ -8,6 +8,6 @@
mclient-lsql--help
HAVE_PERL_SWIG?perl_dbi
HAVE_PYTHON_SWIG?python_dbapi
-#HAVE_PYTHON_SWIG?python_dbapi_embedded
+HAVE_PYTHON_SWIG?python_dbapi_embedded
HAVE_PHP?php_monetdb
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
