[prev in list] [next in list] [prev in thread] [next in thread]
List: monetdb-checkins
Subject: [Monetdb-checkins] testing/src Mtest.py.in,,1.55,1.56
From: Stefan Manegold <stmane () users ! sourceforge ! net>
Date: 2009-12-15 23:47:11
Message-ID: E1NKh6l-0007xm-Ea () sfp-cvsdas-1 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]
Update of /cvsroot/monetdb/testing/src
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30580/src
Modified Files:
Mtest.py.in
Log Message:
propagated changes of Tuesday Dec 15 2009 - Wednesday Dec 16 2009
from the Nov2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/12/15 - stmane: src/Mtest.py.in,1.43.2.14
fixed typo: "=" -> "+"
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/12/15 - mr-meltdown: src/Mtest.py.in,1.43.2.15
rename V into C (because C sounds more like Crash, than V sounds like Violation)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/12/15 - stmane: src/Mtest.py.in,1.43.2.16
(try to) properly distinguish between killing tests due to timeout
and killing orphan processes after a test has (been) stopped)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: Mtest.py.in
===================================================================
RCS file: /cvsroot/monetdb/testing/src/Mtest.py.in,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- Mtest.py.in 15 Dec 2009 00:40:33 -0000 1.55
+++ Mtest.py.in 15 Dec 2009 23:47:01 -0000 1.56
@@ -631,7 +631,7 @@
difftext = difftext + ' (Killed)'
if SockTime == F_SEGV:
diffclass = 'segfault'
- difftext = difftext = ' (Crash)'
+ difftext = difftext + ' (Crash)'
if COMPBITSOIDSLINK:
SYSTEM = DISTVER+", "+COMPBITSOIDSLINK+":"
else:
@@ -1793,8 +1793,6 @@
if tres == 'timeout':
timeout = F_TIME
- elif tres == 'kill':
- killed = F_KILL
elif tres == 'segfault':
segfaulted = F_SEGV
@@ -1822,7 +1820,7 @@
if p is not None:
for l in open(f):
p.write("! "+l)
-# killed = F_KILL
+ killed = F_KILL
p.close()
sockerr = F_OK
@@ -2336,14 +2334,14 @@
ClntOut = open(TestOutFile, 'a')
ClntErr = open(TestErrFile, 'a')
- killed = False
+ timedout = False
if ServerReady:
if CALL == "other":
cmd = os.path.join(".",TST+EXT)+" "+TST+" "+PRELUDE
- killed = RunIt(cmd, "", ClntOut, ClntErr, CTIMEOUT)
+ timedout = RunIt(cmd, "", ClntOut, ClntErr, CTIMEOUT)
elif CALL == "python":
cmd = exe['python'][1]+" "+TST+EXT+" "+TST+" "+PRELUDE
- killed = RunIt(cmd, "", ClntOut, ClntErr, CTIMEOUT)
+ timedout = RunIt(cmd, "", ClntOut, ClntErr, CTIMEOUT)
elif CALL in ["mal", "malXs", "milS", "milSXs"]:
cmd = '%s%s --dbname=%s %s ' % (exe['Mserver'][1], LOCAL_CONF, \
TSTDB, PRELUDE) if par['ALGEBRA']:
@@ -2360,12 +2358,12 @@
for f in d:
if test.match(f):
if CALL[:3] == "mal":
- killed = RunIt(cmd + f, open(os.devnull), ClntOut, \
ClntErr, TIMEOUT) + timedout = RunIt(cmd + f, \
open(os.devnull), ClntOut, ClntErr, TIMEOUT) elif par['M5']:
- killed = RunIt(cmd+" --dbinit=\"include mil_scenario; \
mil();\" "+f, open(os.devnull), ClntOut, ClntErr, TIMEOUT) + \
timedout = RunIt(cmd+" --dbinit=\"include mil_scenario; mil();\" "+f, \
open(os.devnull), ClntOut, ClntErr, TIMEOUT) else:
- killed = RunIt(cmd, open(f), ClntOut, ClntErr, TIMEOUT)
- if killed:
+ timedout = RunIt(cmd, open(f), ClntOut, ClntErr, \
TIMEOUT) + if timedout:
break
elif CALL in ["milC", "milCXs", "malC", "malCXs"]:
TSTs = []
@@ -2387,8 +2385,8 @@
else:
Clnt = '' # cannot happen
for f in TSTs:
- killed = RunIt(Clnt, open(f), ClntOut, ClntErr, TIMEOUT)
- if killed:
+ timedout = RunIt(Clnt, open(f), ClntOut, ClntErr, TIMEOUT)
+ if timedout:
break
#TODO
@@ -2408,8 +2406,8 @@
Clnt = exe['SQL_Client'][1]
for f in TSTs:
- killed = RunIt(Clnt, open(f), ClntOut, ClntErr, TIMEOUT)
- if killed:
+ timedout = RunIt(Clnt, open(f), ClntOut, ClntErr, TIMEOUT)
+ if timedout:
break
elif CALL in ["xq", "xqXs"]:
TSTs = []
@@ -2426,8 +2424,8 @@
Clnt = exe['XQuery_Client'][1]+" "
for f in TSTs:
- killed = RunIt(Clnt+f, "", ClntOut, ClntErr, TIMEOUT)
- if killed:
+ timedout = RunIt(Clnt+f, "", ClntOut, ClntErr, TIMEOUT)
+ if timedout:
break
else:
for fp in ClntOut,ClntErr:
@@ -2479,7 +2477,7 @@
pSrvr.wait()
pSrvrTimer.cancel()
pSrvrTimer = None
- killed = killed or pSrvr.killed
+ timedout = timedout or pSrvr.killed
if MkillUsersAT:
StopAt(ATJOB2,ME)
@@ -2542,7 +2540,7 @@
segfaulted = True
timedout = False
- if not killed and not segfaulted:
+ if not timedout and not segfaulted:
TO = re.compile("^!.*Mtimeout.*: Timeout: ", re.MULTILINE)
if os.path.isfile(TestErrFile):
for l in open(TestErrFile):
@@ -2555,8 +2553,6 @@
if segfaulted:
return "segfault"
- elif killed:
- return "kill"
elif timedout:
return "timeout"
@@ -3779,7 +3775,7 @@
# we write in SQL the same codes as testweb uses in the HTML
# pages, for readability
- Fcodes = ['o', 'x', 'S', 'T', 'X', 'V', '-']
+ Fcodes = ['o', 'x', 'S', 'T', 'X', 'C', '-']
# we are not interested in the compiler, not its path, nor its
# options. We do store the options separately, though
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
Monetdb-checkins mailing list
Monetdb-checkins@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic