Changeset: c86b6c89e97b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c86b6c89e97b
Modified Files:
testing/Mtest.py.in
testing/README
Branch: Jan2014
Log Message:
Implemented option to not pass --forcemito to server for a test.
diffs (63 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1838,6 +1838,8 @@ def RunTest(env, TST, BusyPorts, COND, o
MissingMods = CheckMods(env, TST, SERVER, CALL)
MissingTests = CheckTests(env, TST, oktests)
+ nomito = os.path.isfile(TST + '.nomito')
+
os.chdir(TSTTRGDIR)
@@ -2031,7 +2033,7 @@ def RunTest(env, TST, BusyPorts, COND, o
TestErr.close()
t0 = time.time()
- tres = DoIt(env, SERVER, CALL, TST, EXT, PRELUDE, TestOutFile,
TestErrFile, STIMEOUT, CTIMEOUT, TIMEOUT, ME, MAPIsockets, length)
+ tres = DoIt(env, SERVER, CALL, TST, EXT, PRELUDE, TestOutFile,
TestErrFile, STIMEOUT, CTIMEOUT, TIMEOUT, ME, MAPIsockets, length, nomito)
if tres == 'segfault':
# rename core file, if any -- might have to check
# /proc/sys/kernel/core_pattern in the future but hopefully
@@ -2664,7 +2666,7 @@ def mapi_ping(port,lang) :
return False
### mapi_ping() #
-def DoIt(env, SERVER, CALL, TST, EXT, PRELUDE, TestOutFile, TestErrFile,
STIMEOUT, CTIMEOUT, TIMEOUT, ME, MAPIsockets, length) :
+def DoIt(env, SERVER, CALL, TST, EXT, PRELUDE, TestOutFile, TestErrFile,
STIMEOUT, CTIMEOUT, TIMEOUT, ME, MAPIsockets, length, nomito) :
ATJOB2 = ""
STDERR.flush()
if quiet:
@@ -2732,6 +2734,11 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR
DBINIT = ['--dbinit=%s' % dbinit]
Srvr = splitcommand(exe['Mserver'][1]) + LOCAL_CONF +
['--dbpath=%s' % os.path.join(env['GDK_DBFARM'], TSTDB)]
+ if nomito:
+ try:
+ Srvr.remove('--forcemito')
+ except ValueError:
+ pass
lang=""
if SERVER == "MAL":
@@ -2991,7 +2998,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR
return None
-### DoIt(env, SERVER, CALL, TST, EXT, PRELUDE, TestOut, TestErr, STIMEOUT,
CTIMEOUT, TIMEOUT, ME, MAPIsockets) #
+### DoIt(env, SERVER, CALL, TST, EXT, PRELUDE, TestOutFile, TestErrFile,
STIMEOUT, CTIMEOUT, TIMEOUT, ME, MAPIsockets, length, nomito) #
def Check(command, input) :
global setpgrp
diff --git a/testing/README b/testing/README
--- a/testing/README
+++ b/testing/README
@@ -86,6 +86,8 @@ http://monetdb.cwi.nl/Development/TestWe
required by the test (optional) (TST.modules)
(^,`)
+ a file that contains a list of tests (one per line) that must
have run successfully prior to the test (optional) (TST.reqtests)
+ + a file that if it exists indicates that the --forcemito flag
+ must not be passed to the server (TST.nomito)
+ a set of files used by the arbitrary executable
(optional) (TST.*)
(^,`)
+ stable (i.e. correct) versions of stdout and stderr
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
