Changeset: 238d6c0ea486 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=238d6c0ea486
Modified Files:
testing/MkillUsers.in
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Jun2016 branch.
diffs (130 lines):
diff --git a/testing/MkillUsers.in b/testing/MkillUsers.in
--- a/testing/MkillUsers.in
+++ b/testing/MkillUsers.in
@@ -71,7 +71,7 @@ if [ "$TEMPLATE_BUILD" ] ; then BINPAT
if [ "$SQL_BUILD" ] ; then BINPATH="$BINPATH
$SQL_BUILD/src/tools $SQL_BUILD/src/tools/.libs" ; fi
if [ "$GEOM_BUILD" ] ; then BINPATH="$BINPATH
$GEOM_BUILD/src/tools $GEOM_BUILD/src/tools/.libs" ; fi
for b in $BINPATH ; do
- files="$files `ls $b/* 2>/dev/null | egrep
'/(lt-)?(mserver5|Mserver|mclient|mclient\.py|Mdiff|Mlog|Mtimeout|pf|actuator|sensor)$'`"
+ files="$files `ls $b/* 2>/dev/null | egrep
'/(lt-)?(mserver5|mclient|mclient\.py|Mdiff|Mlog|Mtimeout)$'`"
done
if type -p fuser >/dev/null
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1528,7 +1528,7 @@ def returnCode(proc, f = None):
def GetBitsAndModsAndThreads(env) :
global setpgrp
rtrn = 0
- cmd = splitcommand(env['exe']['Mserver'][1])
+ cmd = splitcommand(env['exe']['mserver5'][1])
cmd.append('--dbpath=%s' % os.path.join(env['GDK_DBFARM'], TSTPREF))
if env.get('MULTIFARM'):
cmd.append('--dbextra=%s' % os.path.join(env['GDK_DBFARM'], TSTPREF +
'_transient'))
@@ -1627,7 +1627,7 @@ def GetBitsAndModsAndThreads(env) :
rtrn = 1
else:
rtrn = 1
- ErrMsg("No output from Mserver/mserver5 when checking for Bits,
Modules & Threads!?")
+ ErrMsg("No output from mserver5 when checking for Bits, Modules &
Threads!?")
if qErr:
STDERR.write(' '.join(cmd) + "\n\n")
STDERR.write(qErr)
@@ -1905,10 +1905,10 @@ def RunTest(env, TST, BusyPorts, COND, o
elif EXT == ".sql" and not env['exe']['SQL_Dump'][0]:
reason = "as %s is not available." % env['SQLDUMP'].split(None, 1)[0]
elem = SkipTest(env, TST, EXT, reason, length)
- elif SERVER in ["MAL", "SQL"] and not env['exe']['Mserver'][0]:
+ elif SERVER in ["MAL", "SQL"] and not env['exe']['mserver5'][0]:
reason = "as %s is not available." % env['MSERVER'].split(None, 1)[0]
elem = SkipTest(env, TST, EXT, reason, length)
- elif EXT == ".malS" and not env['exe']['Mserver'][0]:
+ elif EXT == ".malS" and not env['exe']['mserver5'][0]:
reason = "as %s is not available." % env['MSERVER'].split(None, 1)[0]
elem = SkipTest(env, TST, EXT, reason, length)
elif CALL == "python" and not env['exe']['python'][0]:
@@ -2467,7 +2467,7 @@ def CheckSocket2(env,SERVER) : #,SrvrEr
os.environ[SERVER+'PORT'] = env[SERVER+'PORT']
op = 'port=%d' % port
np = 'port=%s' % env[SERVER+'PORT']
- env['exe']['Mserver'] = env['exe']['Mserver'][0] ,
env['exe']['Mserver'][1].replace(op, np)
+ env['exe']['mserver5'] = env['exe']['mserver5'][0] ,
env['exe']['mserver5'][1].replace(op, np)
env['exe']['MAL_Client'] = env['exe']['MAL_Client'][0] ,
env['exe']['MAL_Client'][1].replace(op, np)
env['exe']['SQL_Client'] = env['exe']['SQL_Client'][0] ,
env['exe']['SQL_Client'][1].replace(op, np)
env['exe']['SQL_Dump'] = env['exe']['SQL_Dump'][0] ,
env['exe']['SQL_Dump'][1].replace(op, np)
@@ -2496,7 +2496,7 @@ def CheckSocket3(env,SERVER,ErrFileName)
res = F_SOCK
Smsg = """
! Socket-Check failed for %sserver on <%s:%d> with #%d; '%s' !
-! %sPORT was not properly released by Mserver/mserver5 !
+! %sPORT was not properly released by mserver5 !
""" % (SERVER, host, port, Serrno, Serrstr, SERVER)
STDERR.write(Smsg)
STDERR.flush()
@@ -2746,7 +2746,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR
if dbinit:
DBINIT = ['--dbinit=%s' % dbinit]
- Srvr = splitcommand(exe['Mserver'][1]) + LOCAL_CONF
+ Srvr = splitcommand(exe['mserver5'][1]) + LOCAL_CONF
if nomito:
try:
Srvr.remove('--forcemito')
@@ -2849,7 +2849,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR
cmd = splitcommand(exe['python'][1]) + [TST + EXT, TST] +
PRELUDE
returncode = RunIt(cmd, "", ClntOut, ClntErr, CTIMEOUT)
elif CALL in ["mal", "malXs"]:
- cmd = splitcommand(exe['Mserver'][1]) + LOCAL_CONF + PRELUDE
+ cmd = splitcommand(exe['mserver5'][1]) + LOCAL_CONF + PRELUDE
cmd.append('--dbpath=%s' % os.path.join(env['GDK_DBFARM'],
TSTDB))
if env.get('MULTIFARM'):
cmd.append('--dbextra=%s' %
os.path.join(env['GDK_DBFARM'], TSTDB + '_transient'))
@@ -2938,7 +2938,7 @@ def DoIt(env, SERVER, CALL, TST, EXT, PR
pSrvr.stdin.flush()
except IOError as err:
EpiFailed = EpiFailed+"\n! Executing "+TST+".epilogue
failed with #"+str(err.errno)+": '"+err.strerror+"'. !"
- EpiFailed = EpiFailed+"\n! Probably, Mserver/mserver5 has
died before or during. !\n"
+ EpiFailed = EpiFailed+"\n! Probably, mserver5 has died
before or during. !\n"
ln="dummy"
while 0 < len(ln) and not ln.startswith('Done..'):
ln=pSrvr.stdout.readline()
@@ -3178,7 +3178,10 @@ def SetExecEnv(exe,verbose) :
if verbose:
STDERR.flush()
for v in exe.keys():
- V = v.upper()
+ if v == 'mserver5':
+ V = 'MSERVER'
+ else:
+ V = v.upper()
if v != 'Mtimeout':
os.environ[V] = CALL+exe['Mtimeout'][1]+exe[v][1]
elif exe[v][0]:
@@ -3484,7 +3487,7 @@ def main(argv) :
"debugger to start before each server"),
('echo-diff', None, 'echo-diff', None,
"echo differences between stable and current test output to
console (stdout)"),
- ('mserver_set', None, 'mserver_set', '<Mserver_option>',
+ ('mserver_set', None, 'mserver_set', '<mserver5_option>',
"This passes a single set to the server"),
('no-clean', None, 'no_clean', None, 'Do not clean up before
test'),
('testweb', None, 'testweb', None, 'Optimize testing for testweb'),
@@ -3929,7 +3932,7 @@ def main(argv) :
exe = {}
exe['Mtimeout'] = CheckExec('Mtimeout') , 'Mtimeout
-timeout %d ' % par['TIMEOUT']
- exe['Mserver'] = CheckExec('mserver5') , '%s mserver5 %s
--debug=%s --set gdk_nr_threads=%s %s --set mapi_open=true --set mapi_port=%s
%s --set monet_prompt= %s %s' % \
+ exe['mserver5'] = CheckExec('mserver5') , '%s mserver5
%s --debug=%s --set gdk_nr_threads=%s %s --set mapi_open=true --set
mapi_port=%s %s --set monet_prompt= %s %s' % \
(env['setDBG'], config, env['GDK_DEBUG'], env['GDK_NR_THREADS'],
env['setMONETDB_MOD_PATH'], env['MAPIPORT'], SOCK, not nomito and '--forcemito'
or '', env['MSERVER_SET'])
exe['Mdiff'] = CheckExec('Mdiff') , 'Mdiff'
exe['python'] = CheckExec(sys.executable) , sys.executable
@@ -4088,7 +4091,7 @@ def main(argv) :
env['TST_INT128'] = ""
env['TST_SINGLE'] = ""
env['TST_THREADS'] = ""
- cmd = splitcommand(env['exe']['Mserver'][1])
+ cmd = splitcommand(env['exe']['mserver5'][1])
cmd.append('--dbpath=%s' % os.path.join(env['GDK_DBFARM'],
TSTPREF))
if env.get('MULTIFARM'):
cmd.append('--dbextra=%s' % os.path.join(env['GDK_DBFARM'],
TSTPREF + '_transient'))
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
