Update of /cvsroot/monetdb/sql/src/test/mapi/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15221/src/test/mapi/Tests
Modified Files:
python_dbapi_embedded.sh
Log Message:
propagated changes of Tuesday Nov 20 2007 - Friday Nov 23 2007
from the SQL_2-20 branch to the development trunk
Index: python_dbapi_embedded.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/python_dbapi_embedded.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- python_dbapi_embedded.sh 22 Nov 2007 21:39:18 -0000 1.6
+++ python_dbapi_embedded.sh 23 Nov 2007 11:53:50 -0000 1.7
@@ -7,13 +7,19 @@
export PYTHONPATH
if [ -n "$TST_FIVE" ] ; then
- PYTHONPATH="$TSTBLDBASE/src/backends/python/monet5:$PYTHONPATH"
- PYTHONPATH="$TSTBLDBASE/src/backends/python/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/python/monet4:$PYTHONPATH"
- PYTHONPATH="$TSTBLDBASE/src/backends/python/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/python/monet$v/:$PYTHONPATH"
+PYTHONPATH="$TSTBLDBASE/src/backends/python/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
-------------------------------------------------------------------------
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
