Update of /cvsroot/monetdb/MonetDB/src/testing
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30845/MonetDB/src/testing
Modified Files:
Tag: MonetDB_1-20
Mtest.py.in
Log Message:
back to treating SQL tests with M5 and .prologue5 files just like all other
tests with .prologue file:
the .prologue[5] file is given tot the server on the command line after the
--dbinit="..." option.
To avoid the (in this case rather inconvenient) echoing of the .prologue5's MAL
code,
we now use "--set mal_listing=0" for these tests.
Net-effect: clean-up of command line paramater quoting to get the SQL/5 tests
working on Windows, again.
Index: Mtest.py.in
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/src/testing/Mtest.py.in,v
retrieving revision 1.309.2.4
retrieving revision 1.309.2.5
diff -u -d -r1.309.2.4 -r1.309.2.5
--- Mtest.py.in 4 Oct 2007 09:38:52 -0000 1.309.2.4
+++ Mtest.py.in 5 Oct 2007 15:25:00 -0000 1.309.2.5
@@ -2159,18 +2159,13 @@
if SERVER == "SQL":
lang="sql"
if par['M5']:
- source = ""
- if PROLOGUE:
- source = ' language.source("%s");' %
(os.path.join(env['TSTTRGDIR'],PROLOGUE[1:]))
- Srvr = "%s --dbinit='%s include sql;%s'" % (Srvr, DBINIT,
source)
+ Srvr = '%s --set mal_listing=0 --dbinit="%s include sql;"' %
(Srvr, DBINIT)
else:
Srvr = '%s --dbinit="%s module(sql_server);"' % (Srvr, DBINIT)
if SERVER == "XQUERY":
lang="xquery"
Srvr = '%s --dbinit="%s module(pathfinder);"' % (Srvr, DBINIT)
- if SERVER != "SQL" or par['M4']:
- Srvr = Srvr+PROLOGUE
- #-background"
+ Srvr = Srvr+PROLOGUE
if os.name == "nt":
Srvr = Srvr+' & echo.& '
else:
-------------------------------------------------------------------------
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-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
