Changeset: cccf172bdf58 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cccf172bdf58
Modified Files:
testing/Mtest.py.in
Branch: mtest
Log Message:
staging
diffs (160 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -536,7 +536,6 @@ def PerformDir(env, testdir) :
failed = 0
skipped = 0
FdErr = F_SKIP
- pdb.set_trace()
TSTDIR = testdir.get('realpath')[len(TSTSRCBASE + os.sep):]
TSTSRCDIR = testdir.get('realpath')
@@ -549,10 +548,8 @@ def PerformDir(env, testdir) :
env['TSTSRCDIR'] = TSTSRCDIR
env['UTSTSRCDIR'] = 'file://' + url(TSTSRCDIR)
env['TSTTRGDIR'] = TSTTRGDIR
- if TSTDIR == os.curdir:
- env['RELSRCDIR'] = os.path.join(os.pardir, env['RELSRCBASE'], TSTSUFF)
- else:
- env['RELSRCDIR'] = os.path.join(* [os.pardir] *
(len(TSTDIR.split(os.sep)) + 1) + [env['RELSRCBASE'], TSTDIR, TSTSUFF])
+ # TODO see if this will work
+ env['RELSRCDIR'] = TSTSRCDIR
os.environ['TSTDB'] = TSTDB
os.environ['TSTDIR'] = TSTDIR
os.environ['TSTSRCDIR'] = TSTSRCDIR
@@ -606,7 +603,8 @@ def PerformDir(env, testdir) :
pSrvr = None
try:
- for TST,COND in testlist:
+ for test in testlist:
+ test_name = test.get('test_name')
if oneserver and (pSrvr is None or pSrvr.poll() is not None):
# restart server
pSrvr = create_mserver5(
@@ -621,20 +619,19 @@ def PerformDir(env, testdir) :
if not testweb:
print('\nGlobal testing timeout reached\n')
break
- tt, FtErr, reason = 0, F_SKIP,"as the global timeout has been
reached"
+ tt, FtErr, reason = 0, F_SKIP, "as the global timeout has been
reached"
else:
- os.environ['TST'] = TST
- tt, FtErr, reason, links = RunTest(env, TST, BusyPorts, COND,
oktests, length, all_tests, pSrvr)
+ tt, FtErr, reason, links = RunTest(env, test, oktests, pSrvr)
alllinks.extend(links)
if tt:
t = "%7.3f" % tt
else:
t = '-.---'
- TIMES.append((TSTDIR, TST, t, tt, FtErr, reason))
+ TIMES.append((TSTDIR, test_name, t, tt, FtErr, reason))
td += tt
FdErr = max(FdErr,FtErr)
if FtErr is None:
- oktests.append(TST)
+ oktests.append(test_name)
finally:
if pSrvr is not None:
pSrvr.terminate()
@@ -990,97 +987,21 @@ def print_err_code(err_code):
}
lookup.get(err_code, lambda _: prgreen('OK'))(err_code)
-def RunTest(env, TST, BusyPorts, COND, oktests, length, all_tests, pSrvr) :
+def RunTest(env, TST, oktests, pSrvr) :
global setpgrp
exit_code = F_SKIP
+ TX = 0
TSTDB = env['TSTDB']
TSTDIR = env['TSTDIR']
TSTSRCDIR = env['TSTSRCDIR']
RELSRCDIR = env['RELSRCDIR']
TSTTRGDIR = env['TSTTRGDIR']
- os.chdir(TSTSRCDIR)
reason = None # reason for skipping (if any)
links = [] # symlinks we make
threads = None # set if we override number of threads
- TX = 0
+
EXT = CALL = SERVER = ""
- # (True, ext)
- x = isexecutable(TST)
- if not x[0]:
- x = isexecutable(TST,'')
- xA = isexecutable(TST + ".MAL")
- xS = isexecutable(TST + ".SQL")
- if x[0]:
- EXT = x[1]
- CALL = "other"
- elif xA[0]:
- EXT = ".MAL"+xA[1]
- CALL = "other"
- SERVER = "MAL"
- elif xS[0]:
- EXT = ".SQL"+xS[1]
- CALL = "other"
- SERVER = "SQL"
- else:
- tests = (
- # file extention EXT CALL SERVER
- ('.py', '.py', 'python', ''),
- ('.MAL.py', '.MAL.py', 'python', 'MAL'),
- ('.SQL.py', '.SQL.py', 'python', 'SQL'),
- ('.malC', '.malC', 'mal', 'MAL'),
- ('_s00.malC', '.malC', 'malXs', 'MAL'),
- ('_p00.malC', '.malC', 'malXp', 'MAL'),
- ('.test', '.test', 'sqltest','SQL'),
- ('.sql', '.sql', 'sql', 'SQL'),
- ('_s00.sql', '.sql', 'sqlXs', 'SQL'),
- ('_p00.sql', '.sql', 'sqlXp', 'SQL'),
- ('.R', '.R', 'R', 'SQL'),
- ('.rb', '.rb', 'ruby', 'SQL'),
- #TODO:
- # ('.java', '.java', 'Java', 'SQL'),
- # ('_s00.java', '.java', 'JavaXs', 'SQL'),
- # ('_p00.java', '.java', 'JavaXp', 'SQL'),
- # ('.odmg', '.odmg', 'odmg', 'SQL'),
- )
- for tst, ext, cll, srv in tests:
- if os.path.isfile(TST + tst) or \
- os.path.isfile(TST + tst + '.src') or \
- os.path.isfile(TST + tst + '.in'):
- EXT = ext
- CALL = cll
- SERVER = srv
- break
- else:
- if os.name == "nt":
- reason = "test missing:
'"+os.path.join(TSTSRCDIR,TST)+".(exe|com|bat|cmd|py|malC|sql)`"
- #TODO:
- #elif os.name == "posix":
- else:
- reason = "test missing:
'"+os.path.join(TSTSRCDIR,TST)+"[.py|.malC|.sql|.R|.rb]`"
- if quiet:
- pass
- elif verbose:
- STDOUT.write('%s%s ' %
- (prompt(), os.path.join(env['TSTDIR'], TST +
EXT)))
- prred('TEST MISSING')
- STDOUT.write('\n')
- else:
- if ttywidth > 0 and length + 10 + 21 >= ttywidth:
- # 10 - length of prompt()
- # 21 - length of time plus result
- l = ttywidth - 10 - 21 - 1
- if len(TST) <= l:
- s = '%-*s ' % (l, TST)
- else:
- s = '%s...%s ' % (TST[:l//2 - 2], TST[l//2+1-l:])
- else:
- s = '%-*s ' % (length, TST)
- STDOUT.write('%s%s' % (prompt(), s))
- prred('TEST MISSING')
- STDOUT.write('\n')
-
- return TX, F_SKIP, reason, links
MissingMods = CheckMods(env, TST, SERVER, CALL)
MissingTests = CheckTests(env, TST, oktests)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
