Changeset: 173a3e39080b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=173a3e39080b
Modified Files:
testing/Mtest.py.in
Branch: mtest
Log Message:
remove Mapprove code
diffs (truncated from 503 to 300 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -550,10 +550,7 @@ def PerformDir(env, testdir, testlist, B
TSTSRCDIR = os.path.normpath(os.path.join(testdir, TSTSUFF))
TSTTRGDIR = os.path.normpath(os.path.join(TSTTRGBASE, TSTPREF, TSTDIR))
- if THISFILE == "Mtest.py":
- TSTDB = TSTPREF + "_" + TSTDIR.replace(os.sep, '_')
- else: # THISFILE == "Mapprove.py"
- TSTDB = ""
+ TSTDB = TSTPREF + "_" + TSTDIR.replace(os.sep, '_')
alltests = []
try:
@@ -627,140 +624,131 @@ def PerformDir(env, testdir, testlist, B
env['TSTDATAPATH'] = TSTDATAPATH
os.environ['TSTDATAPATH'] = TSTDATAPATH
- if THISFILE == "Mtest.py":
- if 'GDK_DBFARM' in env:
- LogDBdir = os.path.join(env['GDK_DBFARM'],TSTDB)
- if not env.get('NOCLEAN') and LogDBdir and
os.path.exists(LogDBdir):
- try:
- shutil.rmtree(LogDBdir)
- except:
- Warn("database '%s` exists, but destroying it failed;
skipping tests in '%s`!" % (TSTDB, TSTSRCDIR))
- #TODO:
- # add "something" to HTML output
- return td, FdErr, interrupted
- if os.path.isabs(LogDBdir) and not os.path.exists(LogDBdir):
- try:
- os.makedirs(LogDBdir)
- except:
- Warn("creating database '%s` failed; skipping tests in
'%s`!" % (TSTDB, TSTSRCDIR))
- #TODO:
- # add "something" to HTML output
- return td, FdErr, interrupted
- if initdb:
- import zipfile
- try:
- z = zipfile.ZipFile(initdb)
- except IOError:
- Warn("initial database '%s` cannot be opened; skipping
tests in '%s`!" % (initdb, TSTSRCDIR))
- #TODO:
- # add "something" to HTML output
- return td, FdErr, interrupted
- try:
- z.extractall(LogDBdir)
- except:
- Warn("initial database '%s` cannot be extracted; skipping
tests in '%s`!" % (initdb, TSTSRCDIR))
- #TODO:
- # add "something" to HTML output
- return td, FdErr, interrupted
- z.close()
- if not oneserver:
- pSrvr =
ServerClass(splitcommand(env['exe']['mserver5'][1]) + ['--dbpath=%s' %
LogDBdir], open(os.devnull, 'w'), open(os.devnull, 'w'), par['TIMEOUT'],
os.path.join(LogDBdir, '.started'), int(env['MAPIPORT']))
- pSrvr.LaunchIt()
- pSrvr.terminate()
- if not os.path.exists(TSTTRGDIR):
- #TODO: set mode to umask
- os.makedirs(TSTTRGDIR)
+ if 'GDK_DBFARM' in env:
+ LogDBdir = os.path.join(env['GDK_DBFARM'],TSTDB)
+ if not env.get('NOCLEAN') and LogDBdir and os.path.exists(LogDBdir):
+ try:
+ shutil.rmtree(LogDBdir)
+ except:
+ Warn("database '%s` exists, but destroying it failed; skipping
tests in '%s`!" % (TSTDB, TSTSRCDIR))
+ #TODO:
+ # add "something" to HTML output
+ return td, FdErr, interrupted
+ if os.path.isabs(LogDBdir) and not os.path.exists(LogDBdir):
+ try:
+ os.makedirs(LogDBdir)
+ except:
+ Warn("creating database '%s` failed; skipping tests in '%s`!"
% (TSTDB, TSTSRCDIR))
+ #TODO:
+ # add "something" to HTML output
+ return td, FdErr, interrupted
+ if initdb:
+ import zipfile
+ try:
+ z = zipfile.ZipFile(initdb)
+ except IOError:
+ Warn("initial database '%s` cannot be opened; skipping tests
in '%s`!" % (initdb, TSTSRCDIR))
+ #TODO:
+ # add "something" to HTML output
+ return td, FdErr, interrupted
+ try:
+ z.extractall(LogDBdir)
+ except:
+ Warn("initial database '%s` cannot be extracted; skipping
tests in '%s`!" % (initdb, TSTSRCDIR))
+ #TODO:
+ # add "something" to HTML output
+ return td, FdErr, interrupted
+ z.close()
+ if not oneserver:
+ pSrvr = ServerClass(splitcommand(env['exe']['mserver5'][1]) +
['--dbpath=%s' % LogDBdir], open(os.devnull, 'w'), open(os.devnull, 'w'),
par['TIMEOUT'], os.path.join(LogDBdir, '.started'), int(env['MAPIPORT']))
+ pSrvr.LaunchIt()
+ pSrvr.terminate()
+ if not os.path.exists(TSTTRGDIR):
+ #TODO: set mode to umask
+ os.makedirs(TSTTRGDIR)
- body_good = []
- body_bad = []
- oktests = []
- if not verbose and not quiet:
- print('\nRunning in %s' % TSTDIR)
- alllinks = []
- pSrvr = None
+ body_good = []
+ body_bad = []
+ oktests = []
+ if not verbose and not quiet:
+ print('\nRunning in %s' % TSTDIR)
+ alllinks = []
+ pSrvr = None
+ try:
try:
- try:
- for TST,COND in testlist:
- if oneserver and (pSrvr is None or pSrvr.poll() is not
None):
- # restart server
- cmd = splitcommand(env['exe']['mserver5'][1]) +
['--dbpath=%s' % LogDBdir] + options
- if env.get('MULTIFARM'):
- cmd.append('--dbextra=%s' %
os.path.join(env['GDK_DBFARM'], TSTPREF + '_transient'))
- shutil.rmtree(os.path.join(env['GDK_DBFARM'],
TSTPREF + '_transient'),
- ignore_errors = True)
- os.makedirs(os.path.join(env['GDK_DBFARM'],
TSTPREF + '_transient'))
- elif env.get('TRANS_INMEM'):
- cmd.append('--dbextra=:inmemory')
- pSrvr = ServerClass(cmd,
- 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():
- if not testweb:
- print('\nGlobal testing timeout reached\n')
- break
- 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)
- alllinks.extend(links)
- if tt:
- t = "%7.3f" % tt
- else:
- t = '-.---'
- TIMES.append((TSTDIR, TST, t, tt, FtErr, reason))
- td += tt
- FdErr = max(FdErr,FtErr)
- if FtErr is None:
- oktests.append(TST)
- except KeyboardInterrupt:
- print('\nInterrupted')
- interrupted = True
- finally:
- if pSrvr is not None:
- pSrvr.terminate()
- pSrvr = None
- TIMES.append((TSTDIR, '', "%7.3f" % td, td, FdErr, None))
- if testweb:
- os.chdir(TSTTRGDIR)
- for f in alllinks:
- remove(f)
+ for TST,COND in testlist:
+ if oneserver and (pSrvr is None or pSrvr.poll() is not None):
+ # restart server
+ cmd = splitcommand(env['exe']['mserver5'][1]) +
['--dbpath=%s' % LogDBdir] + options
+ if env.get('MULTIFARM'):
+ cmd.append('--dbextra=%s' %
os.path.join(env['GDK_DBFARM'], TSTPREF + '_transient'))
+ shutil.rmtree(os.path.join(env['GDK_DBFARM'], TSTPREF
+ '_transient'),
+ ignore_errors = True)
+ os.makedirs(os.path.join(env['GDK_DBFARM'], TSTPREF +
'_transient'))
+ elif env.get('TRANS_INMEM'):
+ cmd.append('--dbextra=:inmemory')
+ pSrvr = ServerClass(cmd,
+ 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():
+ if not testweb:
+ print('\nGlobal testing timeout reached\n')
+ break
+ 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)
+ alllinks.extend(links)
+ if tt:
+ t = "%7.3f" % tt
+ else:
+ t = '-.---'
+ TIMES.append((TSTDIR, TST, t, tt, FtErr, reason))
+ td += tt
+ FdErr = max(FdErr,FtErr)
+ if FtErr is None:
+ oktests.append(TST)
+ except KeyboardInterrupt:
+ print('\nInterrupted')
+ interrupted = True
+ finally:
+ if pSrvr is not None:
+ pSrvr.terminate()
+ pSrvr = None
+ TIMES.append((TSTDIR, '', "%7.3f" % td, td, FdErr, None))
+ if testweb:
+ os.chdir(TSTTRGDIR)
+ for f in alllinks:
+ remove(f)
- # remove extra files created by tests
- for f in listdir(TSTTRGDIR):
- ff = os.path.join(TSTTRGDIR, f)
- if os.path.islink(ff):
- continue
- for pat in [
- 'times.lst', 'times.sql',
- '*.client.err', '*.client.out',
- '*.server.err', '*.server.out',
- '*.stable.err*', '*.stable.out*',
- '*.test.err', '*.test.out',
- 'SingleServer.out', 'SingleServer.err']:
- if fnmatch.fnmatch(f, pat):
- break
- else:
- remove(ff)
+ # remove extra files created by tests
+ for f in listdir(TSTTRGDIR):
+ ff = os.path.join(TSTTRGDIR, f)
+ if os.path.islink(ff):
+ continue
+ for pat in [
+ 'times.lst', 'times.sql',
+ '*.client.err', '*.client.out',
+ '*.server.err', '*.server.out',
+ '*.stable.err*', '*.stable.out*',
+ '*.test.err', '*.test.out',
+ 'SingleServer.out', 'SingleServer.err']:
+ if fnmatch.fnmatch(f, pat):
+ break
+ else:
+ remove(ff)
- if testweb:
- try:
- os.removedirs(TSTTRGDIR)
- except:
- pass
-
- else: # THISFILE == "Mapprove.py"
- if not os.path.exists(TSTTRGDIR):
- Warn("Output directory '%s` missing; skipping directory!" %
TSTTRGDIR)
- return td, max(FdOut, FdErr), interrupted
-
- for TST,COND in testlist:
- td += ApproveOutput(env, TST)
+ if testweb:
+ try:
+ os.removedirs(TSTTRGDIR)
+ except:
+ pass
return td, FdErr, interrupted
### PerformDir(env, testdir, testlist, BusyPorts) #
@@ -2439,24 +2427,6 @@ def SetExecEnv(exe,verbose) :
STDOUT.flush()
### SetExecEnv(exe,procdebug) #
-def ReadMapproveRc(f) :
- v = {}
- v['SYST'] = SYST
- v['RELEASE'] = RELEASE
- v['DIST'] = DIST
- v['VERSION'] = VERSION
- v['BITS'] = ''
- v['INT128'] = ''
- v['SINGLE'] = ''
- v['ARCH'] = ''
- if os.path.isfile(f):
- r = re.compile('^([A-Z][A-Z0-9_]*) = "(.*)".*$')
- for l in openutf8(f):
- m = r.match(l)
- if m:
- v[m.group(1)] = m.group(2)
- return v
-### ReadMapproveRc(f) #
#############################################################################
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
