Changeset: 7470c5da8828 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7470c5da8828
Modified Files:
testing/Mtest.py.in
Branch: Jun2020
Log Message:
Save mserver output from SingleServer test directories.
diffs (36 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1339,7 +1339,12 @@ def PerformDir(env, testdir, testlist, B
for TST,COND in testlist:
if oneserver and (pSrvr is None or pSrvr.poll() is not
None):
# restart server
- pSrvr =
ServerClass(splitcommand(env['exe']['mserver5'][1]) + ['--dbpath=%s' %
LogDBdir] + options, open(os.devnull, 'w'), open(os.devnull, 'w'), 0,
os.path.join(LogDBdir, '.started'), int(env['MAPIPORT']))
+ pSrvr =
ServerClass(splitcommand(env['exe']['mserver5'][1]) + ['--dbpath=%s' %
LogDBdir] + options,
+ open(os.path.join(TSTTRGDIR,
'SingleServer.out'), 'a'),
+ open(os.path.join(TSTTRGDIR,
'SingleServer.err'), 'a'),
+ 0,
+ os.path.join(LogDBdir, '.started'),
+ int(env['MAPIPORT']))
os.chdir(TSTTRGDIR)
pSrvr.LaunchIt()
if global_timeout and start_time + global_timeout <
time.time():
@@ -1401,7 +1406,8 @@ def PerformDir(env, testdir, testlist, B
'*.out.diff.html', '*.out.head.html', '*.out.html',
'*.server.err', '*.server.out',
'*.stable.err*', '*.stable.out*',
- '*.test.err', '*.test.out']:
+ '*.test.err', '*.test.out',
+ 'SingleServer.out', 'SingleServer.err']:
if fnmatch.fnmatch(f, pat):
break
else:
@@ -2881,6 +2887,8 @@ class ServerClass:
self.proc.wait()
t.cancel()
self.code = returnCode(self.proc, self.errfile)
+ self.outfile.close()
+ self.errfile.close()
def LaunchIt(self):
global setpgrp
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
