Changeset: ff3260e2945e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ff3260e2945e
Modified Files:
testing/Mtest.py.in
Branch: Nov2019
Log Message:
Only start server when its needed, leave server crash information somewhere.
diffs (25 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1338,11 +1338,8 @@ def PerformDir(env, testdir, testlist, B
pSrvr = None
try:
try:
- if oneserver:
- pSrvr = ServerClass()
- pSrvr.LaunchIt(splitcommand(env['exe']['mserver5'][1]) +
['--dbpath=%s' % LogDBdir], open(os.devnull, 'w'), open(os.devnull, 'w'), 0,
os.path.join(LogDBdir, '.started'), int(env['MAPIPORT']))
for TST,COND in testlist:
- if oneserver and pSrvr.poll() is not None:
+ if oneserver and (pSrvr is None or pSrvr.poll() is not
None):
# restart server
pSrvr = ServerClass()
pSrvr.LaunchIt(splitcommand(env['exe']['mserver5'][1])
+ ['--dbpath=%s' % LogDBdir], open(os.devnull, 'w'), open(os.devnull, 'w'), 0,
os.path.join(LogDBdir, '.started'), int(env['MAPIPORT']))
@@ -2295,7 +2292,7 @@ def RunTest(env, TST, BusyPorts, COND, o
elif pSrvr.poll() is None:
sockerr = F_OK
else:
- sres = returnCode(pSrvr)
+ sres = returnCode(pSrvr, TestErrFile)
if sres == 'segfault':
sockerr = F_SEGV
elif sres == 'abort':
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
