Changeset: 6df1de2f1ecd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6df1de2f1ecd
Modified Files:
testing/Mfilter.py.in
testing/Mtest.py.in
Branch: Feb2013
Log Message:
Merged from Oct2012
diffs (50 lines):
diff --git a/testing/Mfilter.py.in b/testing/Mfilter.py.in
--- a/testing/Mfilter.py.in
+++ b/testing/Mfilter.py.in
@@ -48,7 +48,7 @@ test = (
# potential differences, which we want to ignore
re.compile('(?:'+')|(?:'.join([
# MAPI port numbers
- r"^MAPI = .*@.*:\d*$",
+ r"^MAPI = (.*@.*:\d*|\(monetdb\) /.*\.s\.monetdb\.\d+)$",
# SPHINX is optional in monetdb5/modules/mal/inspec05
r'\[\s+"[^"]*",\s+"(?:command|function|pattern)",\s+"sphinx",\s+"[^"]*",\s+"[^"]*"\s+\]',
])+')', re.MULTILINE),
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3729,9 +3729,17 @@ def main(argv) :
global SOCK, HOST
if SOCK:
- SOCK = "--set mapi_usock=%s/.s.monetdb.%s" % \
- (env['GDK_DBFARM'], env['MAPIPORT'])
- HOST = env['GDK_DBFARM']
+ # we cannot put the UNIX socket in the mtest root, because that
+ # makes the UNIX socket too long on most platforms, so use
+ # /var/tmp/mtest and try not to forget to clean that up
+ sockdir = "/var/tmp/mtest-%d" % os.getpid()
+ try:
+ os.mkdir(sockdir);
+ SOCK = "--set mapi_usock=%s/.s.monetdb.%s" % \
+ (sockdir, env['MAPIPORT'])
+ HOST = sockdir
+ except:
+ SOCK = ""
else:
SOCK = ""
@@ -4071,6 +4079,13 @@ VALUES (%s, '%s', '%s', '%s',
if not testweb:
CreateHtmlIndex(env, *body)
+ # cleanup the place where we put our UNIX sockets
+ if SOCK:
+ try:
+ shutil.rmtree(sockdir);
+ except:
+ pass
+
Failed = 0
for f in Failure[1:-1]:
Failed += len(f)
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
