Changeset: fcf94c8bbebc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fcf94c8bbebc
Modified Files:
Branch: default
Log Message:
Merge with Dec2011 branch.
diffs (truncated from 1233 to 300 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -2742,7 +2742,10 @@ main(int argc, char **argv)
itimemode = T_SECS;
} else if (strcmp(optarg, "m") == 0) {
itimemode = T_MINSECS;
- } /* else: fall back to default (human) */
+ } else if (*optarg != '\0') {
+ fprintf(stderr, "warning: invalid
argument to -i: %s\n",
+ optarg);
+ }
}
break;
case 'h':
diff --git a/sql/backends/monet5/datacell/Tests/All
b/sql/backends/monet5/datacell/Tests/All
--- a/sql/backends/monet5/datacell/Tests/All
+++ b/sql/backends/monet5/datacell/Tests/All
@@ -1,6 +1,6 @@
# SQL
# (Must be first as otherwise creation of schema datacell via
-# 50_datacell
+# 50_datacell.sql is not triggered, as first SQL-clients does not connect
# on "virgin" database!???)
ENABLE_DATACELL?scenario00
ENABLE_DATACELL?scenario01
diff --git a/sql/test/Tests/copy_into.sql.in b/sql/test/Tests/copy_into.sql.in
--- a/sql/test/Tests/copy_into.sql.in
+++ b/sql/test/Tests/copy_into.sql.in
@@ -5,11 +5,11 @@ insert into copyouttest values ('','');
insert into copyouttest values (' Test ','');
select * from copyouttest;
-copy select * from copyouttest into '$QTSTTRGBASE/mTests/x.dat' delimiters
'[]', '\n';
+copy select * from copyouttest into '$QTSTTRGDIR/x.dat' delimiters '[]', '\n';
drop table copyouttest;
create table copyintest ( str VARCHAR(20), str2 VARCHAR(20));
-copy into copyintest from '$QTSTTRGBASE/mTests/x.dat' delimiters '[]', '\n',
'"';
+copy into copyintest from '$QTSTTRGDIR/x.dat' delimiters '[]', '\n', '"';
select * from copyintest;
drop table copyintest;
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -134,14 +134,14 @@ except ImportError:
_configure(os.path.join('@QXprefix@', p))
sys.path.insert(0, p)
if os.environ.has_key('PYTHONPATH'):
- p = p + os.pathsep + os.environ['PYTHONPATH']
+ p += os.pathsep + os.environ['PYTHONPATH']
os.environ['PYTHONPATH'] = p
p = distutils.sysconfig.get_python_lib(0, 0, '')
p = _configure(os.path.join('@QXprefix@', p))
sys.path.insert(0, p)
import MonetDBtesting.subprocess26 as subprocess
if os.environ.has_key('PYTHONPATH'):
- p = p + os.pathsep + os.environ['PYTHONPATH']
+ p += os.pathsep + os.environ['PYTHONPATH']
os.environ['PYTHONPATH'] = p
import string # for whitespace
@@ -180,7 +180,7 @@ def isexecutable(TST, ext = '.sh') :
elif os.name == "posix":
#TODO:
# check with "file", and set executable
- TST = TST + ext
+ TST += ext
if ( os.path.isfile(TST ) and os.access(TST ,os.X_OK) ) or
\
( os.path.isfile(TST+".src") and os.access(TST+".src",os.X_OK) ):
return [ 1, ext ]
@@ -212,7 +212,7 @@ except ImportError:
sys.path.insert(0, p)
from MonetDBtesting import monet_options
if os.environ.has_key('PYTHONPATH'):
- p = p + os.pathsep + os.environ['PYTHONPATH']
+ p += os.pathsep + os.environ['PYTHONPATH']
os.environ['PYTHONPATH'] = p
import threading, signal
@@ -515,7 +515,7 @@ def Usage (options) :
def ErrMsg(TEXT) :
STDOUT.flush()
- STDERR.write("\n"+THISFILE+": ERROR: %s\n\n" % TEXT)
+ STDERR.write("\n%s: ERROR: %s\n\n" % (THISFILE, TEXT))
STDERR.flush()
### ErrMsg(TEXT) #
@@ -530,7 +530,7 @@ def Warn(TEXT) :
except IOError:
pass
try:
- STDERR.write("\n"+THISFILE+" Warning: %s\n\n" % TEXT)
+ STDERR.write("\n%s Warning: %s\n\n" % (THISFILE, TEXT))
STDERR.flush()
except IOError:
pass
@@ -562,7 +562,6 @@ def try_open(path, mode) :
def CreateHtmlIndex (env, *body) :
TSTDIR=env['TSTDIR']
- TSTTRGBASE=env['TSTTRGBASE']
TSTTRGDIR=env['TSTTRGDIR']
if TSTDIR:
@@ -607,7 +606,7 @@ def CreateHtmlIndex (env, *body) :
'cellspacing': '0',
'cellpadding': '3'},
tr))))
- f = open(INDEX+".head.html","w")
+ f = open("%s.head.html" % INDEX,"w")
html.write(f, True)
f.close()
@@ -634,64 +633,55 @@ def CreateHtmlIndex (env, *body) :
'marginwidth': '0',
'marginheight': '0'}),
Element('frame',
- {'src':
url(env['_'+TSTDIR+'_BODY_'][0]),
+ {'src': url(env['_%s_BODY_' %
TSTDIR][0]),
'scrolling': 'auto',
'name': '%s_%s_body' % (DISTVER,
TSTDIR),
'frameborder': 'yes',
'bordercolor': white,
'marginwidth': '0',
'marginheight': '0'})))
- f = open(INDEX+".html","w")
+ f = open("%s.html" % INDEX, "w")
html.write(f, True)
f.close()
- env['_'+TSTDIR+'_BODY_'] = ["",0]
+ env['_%s_BODY_' % TSTDIR] = ["", 0]
os.chdir(BACK)
### CreateHtmlIndex (env, *body) #
-def CreateTstWhatXhtml (env, TST, stableWHAT, EXT, SockTime) :
+def CreateTstWhatXhtml (env, TST, stableWHAT, EXT, result) :
WHAT = stableWHAT[7:11]
TSTDIR = env['TSTDIR']
TSTSRCDIR = env['TSTSRCDIR']
- l = ''
- for l in open(TST+WHAT+".diff.html"):
- pass
- if l[:14] == '<!--NoDiffs-->':
+ if result == F_OK:
diffclass = 'good'
difftext = 'No differences'
- elif l[:17] == '<!--MinorDiffs-->':
+ elif result == F_WARN:
diffclass = 'warning'
difftext = 'Minor differences'
- elif l[:17] == '<!--MajorDiffs-->':
- diffclass = 'error'
+ else: # result == F_ERROR:
difftext = 'Major differences'
+ if result == F_SOCK:
+ diffclass = 'socket'
+ difftext += ' (Socket)'
+ elif result == F_TIME:
+ diffclass = 'timeout'
+ difftext += ' (Timeout)'
+ elif result == F_RECU:
+ diffclass = 'recursion'
+ difftext += ' (Recursion)'
+ elif result == F_ABRT:
+ diffclass = 'abort'
+ difftext += ' (Aborted)'
+ elif result == F_SEGV:
+ diffclass = 'segfault'
+ difftext += ' (Crash)'
+ else:
+ diffclass = 'error'
+
+ if COMPBITSOIDSLINK:
+ SYSTEM = '%s, %s:' % (DISTVER, COMPBITSOIDSLINK)
else:
- Warn("Unexpected last line in %s:\n%s" % (TST+WHAT+".diff.html",l))
- f = open(TST+WHAT+".diff.html","a")
- f.write("\n<!--MajorDiffs-->\n")
- f.close()
- diffclass = 'error'
- difftext = 'Major differences'
- if diffclass == 'error' and SockTime in (F_SOCK, F_TIME, F_RECU, F_ABRT,
F_SEGV):
- if SockTime == F_SOCK:
- diffclass = 'socket'
- difftext = difftext + ' (Socket)'
- if SockTime == F_TIME:
- diffclass = 'timeout'
- difftext = difftext + ' (Timeout)'
- if SockTime == F_RECU:
- diffclass = 'recursion'
- difftext = difftext + ' (Recursion)'
- if SockTime == F_ABRT:
- diffclass = 'abort'
- difftext = difftext + ' (Aborted)'
- if SockTime == F_SEGV:
- diffclass = 'segfault'
- difftext = difftext + ' (Crash)'
- if COMPBITSOIDSLINK:
- SYSTEM = DISTVER+", "+COMPBITSOIDSLINK+":"
- else:
- SYSTEM = DISTVER+":"
+ SYSTEM = "%s:" % DISTVER
html = Element('html', {},
Element('head', {},
@@ -719,7 +709,7 @@ def CreateTstWhatXhtml (env, TST, stable
'bordercolor': white,
'marginwidth': '0',
'marginheight': '0'})))
- f = open(".%s%s.html" % (TST, WHAT),"w")
+ f = open(".%s%s.html" % (TST, WHAT), "w")
html.write(f, True)
f.close()
f = open(".%s%s.head.html" % (TST, WHAT),"w")
@@ -767,7 +757,7 @@ def CreateTstWhatXhtml (env, TST, stable
Text('test%s' % WHAT)),
Text(' of '),
Element('a', {'href': TST + EXT, 'target': target},
- Text('%s%s' % (TST, EXT)))])
+ Text(TST + EXT))])
if REV:
d = urlpref
if os.path.isfile(TST + EXT + '.src'):
@@ -817,7 +807,7 @@ def CreateTstWhatXhtml (env, TST, stable
f.close()
#TODO?
# <A HREF='.Mtest.Slave.Log.OutErr'
TARGET='"""+DISTVER+"_"+TSTDIR+"_"+TST+"_"+WHAT[1:]+"""_body'>LOG</A>).
-### CreateTstWhatXhtml (env, TST, stableWHAT, EXT) #
+### CreateTstWhatXhtml (env, TST, stableWHAT, EXT, results) #
def CreateSrcIndex (env, TST, EXT) :
TSTSRCDIR = env['TSTSRCDIR']
@@ -826,7 +816,7 @@ def CreateSrcIndex (env, TST, EXT) :
if URLPREFIX:
framesrc = '%s%s/%s/%s%s' % (URLPREFIX, url(TSTDIR), TSTSUFF, TST, EXT)
else:
- f = open("."+TST+".nosrc.index.html","w")
+ f = open(".%s.nosrc.index.html" % TST, "w")
html = Element('html', {},
Element('head', {},
Element('title', {},
@@ -867,7 +857,7 @@ def CreateSrcIndex (env, TST, EXT) :
'bordercolor': white,
'marginwidth': '0',
'marginheight': '0'})))
- f = open("."+TST+".src.index.html","w")
+ f = open(".%s.src.index.html" % TST,"w")
html.write(f, True)
f.close()
@@ -902,7 +892,7 @@ def CreateSrcIndex (env, TST, EXT) :
'cellspacing': '0',
'cellpadding': '3'},
tr))))
- f = open("."+TST+".src.index.head.html","w")
+ f = open(".%s.src.index.head.html" % TST, "w")
html.write(f, True)
f.close()
### CreateSrcIndex (env, TST, EXT) #
@@ -932,42 +922,12 @@ def AddHref (href, target, linktext, dif
return [a]
### AddHref (TSTDIR, TST, WHAT, diff) #
-def AddTstToHtmlIndex (env, TST, STABLEout, STABLEerr, EXT, SockTime) :
+def AddTstToHtmlIndex (env, TST, STABLEout, STABLEerr, EXT, o, e) :
TSTDIR = env['TSTDIR']
- CreateTstWhatXhtml(env, TST, STABLEout, EXT, F_OK)
- CreateTstWhatXhtml(env, TST, STABLEerr, EXT, SockTime)
-
- for l in open(TST+".out.diff.html"):
- pass
- if l[:14] == '<!--NoDiffs-->':
- o = F_OK
- elif l[:17] == '<!--MinorDiffs-->':
- o = F_WARN
- elif l[:17] == '<!--MajorDiffs-->':
- o = F_ERROR
- else:
- Warn("Unexpected last line in %s:\n%s" % (TST+".out.diff.html",l))
- ff = open(TST+".out.diff.html","a")
- ff.write("\n<!--MajorDiffs-->\n")
- ff.close()
- o = F_ERROR
- for l in open(TST+".err.diff.html"):
- pass
- if l[:14] == '<!--NoDiffs-->':
- e = F_OK
- elif l[:17] == '<!--MinorDiffs-->':
- e = F_WARN
- elif l[:17] == '<!--MajorDiffs-->':
- e = F_ERROR
- else:
- Warn("Unexpected last line in %s:\n%s" % (TST+".err.diff.html",l))
- ff = open(TST+".err.diff.html","a")
- ff.write("\n<!--MajorDiffs-->\n")
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
