Update of /cvsroot/monetdb/sql/src/test/mapi/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv22315/Tests

Modified Files:
      Tag: SQL_2-20
        php_monetdb.stable.out python_dbapi_embedded.sh 
Log Message:
another attempt at fixing python_dbapi_embedded.
We now add TSTBLDDIR/src/backend/monet{4,5}/{,.libs}.

approved php_monetdb (perl test now cleans up table)


Index: python_dbapi_embedded.sh
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/python_dbapi_embedded.sh,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- python_dbapi_embedded.sh    29 Oct 2007 17:26:10 -0000      1.1.2.5
+++ python_dbapi_embedded.sh    19 Nov 2007 08:18:25 -0000      1.1.2.6
@@ -3,11 +3,17 @@
 PATH="`monetdb-clients-config --pkglibdir`/Tests:$PATH"
 export PATH
 
-PYTHONPATH="`monetdb-config --pythonlibdir`:`monetdb-clients-config 
--pythonlibdir`:`monetdb-clients-config 
--pythonlibdir`/MonetDB:`monetdb-sql-config --pythonlibdir`:$PYTHONPATH"
+PYTHONPATH="`monetdb-config --pythonlibdir`:`monetdb-clients-config 
--pythonlibdir`:`monetdb-clients-config --pythonlibdir`/MonetDB:$PYTHONPATH"
 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"
 else
+       PYTHONPATH="$TSTBLDBASE/src/backends/monet4/:$PYTHONPATH"
+       PYTHONPATH="$TSTBLDBASE/src/backends/monet4/.libs:$PYTHONPATH"
+       export PYTHONPATH
        Mlog -x "sqlsample.py $GDK_DBFARM $TSTDB 4"
 fi

Index: php_monetdb.stable.out
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/mapi/Tests/php_monetdb.stable.out,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- php_monetdb.stable.out      22 Oct 2007 19:58:09 -0000      1.1.2.1
+++ php_monetdb.stable.out      19 Nov 2007 08:18:25 -0000      1.1.2.2
@@ -55,7 +55,6 @@
 auths
 privileges
 profile
-perl_table
 id     name    schema_id       query   type    system  commit_action   
temporary       
 981    schemas 980             0       true    0       0       
 986    types   980             0       true    0       0       
@@ -84,7 +83,6 @@
 3831   auths   980             0       true    0       0       
 3835   privileges      980             0       true    0       0       
 3841   profile 1081            0       true    2       0       
-3849   perl_table      980             0       false   0       0       
 
 # 20:50:24 >  
 # 20:50:24 >  Done.


-------------------------------------------------------------------------
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

Reply via email to