Changeset: edb0f1df59e7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/edb0f1df59e7
Modified Files:
testing/Mtest.py.in
Branch: default
Log Message:
Only prepare mserver command when we need it.
Also only delete transient farm when we need to start a new server.
diffs (155 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -2739,67 +2739,61 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
ClntOut = openutf8(ClntOutFile,"w")
ClntErr = openutf8(ClntErrFile,"w")
- Srvr = splitcommand(exe['mserver5'][1])
- if nomito:
- try:
- Srvr.remove('--forcemito')
- except ValueError:
- pass
- if threads is not None:
- for i in range(len(Srvr)):
- if Srvr[i].startswith('gdk_nr_threads='):
- Srvr[i] = 'gdk_nr_threads=%s' % threads
- break
- dbpath = os.path.join(env['GDK_DBFARM'], TSTDB)
- Srvr.append('--dbpath=%s' % dbpath)
- if env.get('MULTIFARM'):
- Srvr.append('--dbextra=%s' % os.path.join(env['GDK_DBFARM'],
TSTDB + '_transient'))
- shutil.rmtree(os.path.join(env['GDK_DBFARM'], TSTDB +
'_transient'),
- ignore_errors = True)
- os.makedirs(os.path.join(env['GDK_DBFARM'], TSTDB +
'_transient'))
- elif env.get('TRANS_INMEM'):
- Srvr.append('--dbextra=in-memory')
- if os.path.isfile(TST + '.options5'):
- Srvr.extend(openutf8(TST + '.options5').read().split())
- lang=""
-
- if SERVER == "MAL":
- lang="mal"
- if SERVER == "SQL":
- lang="sql"
-
- # enable r integration in server
- if (not all_tests or (COND != None and "HAVE_LIBR" in COND)) and
CONDITIONALS['HAVE_LIBR'] and CONDITIONALS['NOT_WIN32']:
- Srvr.extend(['--set', 'embedded_r=yes'])
-
- savepath = None
- savepypath = os.environ.get('PYTHONPATH')
- savepyhome = os.environ.get('PYTHONHOME')
- if (COND != None and "HAVE_LIBPY3" in COND) and
CONDITIONALS['HAVE_LIBPY3']:
- # enable Python 3 integration in server
- if winreg is not None:
- if env['TST_BITS'] == '32bit':
- if sys.maxsize > 2**32:
- regkey =
r'SOFTWARE\Wow6432Node\Python\PythonCore\3.@PY3VER@-32\InstallPath'
+ if PSRVR is None:
+ Srvr = splitcommand(exe['mserver5'][1])
+ if nomito:
+ try:
+ Srvr.remove('--forcemito')
+ except ValueError:
+ pass
+ if threads is not None:
+ for i in range(len(Srvr)):
+ if Srvr[i].startswith('gdk_nr_threads='):
+ Srvr[i] = 'gdk_nr_threads=%s' % threads
+ break
+ dbpath = os.path.join(env['GDK_DBFARM'], TSTDB)
+ Srvr.append('--dbpath=%s' % dbpath)
+ if env.get('MULTIFARM'):
+ Srvr.append('--dbextra=%s' %
os.path.join(env['GDK_DBFARM'], TSTDB + '_transient'))
+ shutil.rmtree(os.path.join(env['GDK_DBFARM'], TSTDB +
'_transient'),
+ ignore_errors = True)
+ os.makedirs(os.path.join(env['GDK_DBFARM'], TSTDB +
'_transient'))
+ elif env.get('TRANS_INMEM'):
+ Srvr.append('--dbextra=in-memory')
+ if os.path.isfile(TST + '.options5'):
+ Srvr.extend(openutf8(TST + '.options5').read().split())
+
+ # enable r integration in server
+ if (not all_tests or (COND != None and "HAVE_LIBR" in COND))
and CONDITIONALS['HAVE_LIBR'] and CONDITIONALS['NOT_WIN32']:
+ Srvr.extend(['--set', 'embedded_r=yes'])
+
+ savepath = None
+ savepypath = os.environ.get('PYTHONPATH')
+ savepyhome = os.environ.get('PYTHONHOME')
+ if (COND != None and "HAVE_LIBPY3" in COND) and
CONDITIONALS['HAVE_LIBPY3']:
+ # enable Python 3 integration in server
+ if winreg is not None:
+ if env['TST_BITS'] == '32bit':
+ if sys.maxsize > 2**32:
+ regkey =
r'SOFTWARE\Wow6432Node\Python\PythonCore\3.@PY3VER@-32\InstallPath'
+ else:
+ regkey =
r'SOFTWARE\Python\PythonCore\3.@PY3VER@-32\InstallPath'
else:
- regkey =
r'SOFTWARE\Python\PythonCore\3.@PY3VER@-32\InstallPath'
- else:
- regkey =
r'SOFTWARE\Python\PythonCore\3.@PY3VER@\InstallPath'
- try:
- with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE, regkey)
as key:
- instpath = winreg.QueryValue(key, None)
- os.environ['PYTHONHOME'] = instpath
- os.environ['PYTHONPATH'] = instpath + 'Lib'
- savepath = os.environ['PATH']
- os.environ['PATH'] = instpath.rstrip('\\') +
os.pathsep + savepath
- except WindowsError:
- pass
- Srvr.extend(['--set', 'embedded_py=3'])
-
- # enable C integration in server
- Srvr.extend(['--set', 'embedded_c=true'])
-
- if PSRVR is None:
+ regkey =
r'SOFTWARE\Python\PythonCore\3.@PY3VER@\InstallPath'
+ try:
+ with winreg.OpenKey(winreg.HKEY_LOCAL_MACHINE,
regkey) as key:
+ instpath = winreg.QueryValue(key, None)
+ os.environ['PYTHONHOME'] = instpath
+ os.environ['PYTHONPATH'] = instpath + 'Lib'
+ savepath = os.environ['PATH']
+ os.environ['PATH'] = instpath.rstrip('\\') +
os.pathsep + savepath
+ except WindowsError:
+ pass
+ Srvr.extend(['--set', 'embedded_py=3'])
+
+ # enable C integration in server
+ Srvr.extend(['--set', 'embedded_c=true'])
+
if env.get('MULTIFARM'):
Srvr.append('--dbextra=%s' %
os.path.join(env['GDK_DBFARM'], TSTPREF + '_transient'))
shutil.rmtree(os.path.join(env['GDK_DBFARM'], TSTPREF +
'_transient'),
@@ -2815,19 +2809,19 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
return 'serverfail'
os.environ['MAPIPORT'] = env['MAPIPORT'] = pSrvr.port
SetExecEnv(exe,pSrvr.port,verbose)
+ if savepath is not None:
+ os.environ['PATH'] = savepath
+ if savepypath:
+ os.environ['PYTHONPATH'] = savepypath
+ else:
+ del os.environ['PYTHONPATH']
+ if savepyhome:
+ os.environ['PYTHONHOME'] = savepyhome
+ else:
+ del os.environ['PYTHONHOME']
else:
PSRVR.timer.settimeout(TIMEOUT)
PSRVR.timer.start()
- if savepath is not None:
- os.environ['PATH'] = savepath
- if savepypath:
- os.environ['PYTHONPATH'] = savepypath
- else:
- del os.environ['PYTHONPATH']
- if savepyhome:
- os.environ['PYTHONHOME'] = savepyhome
- else:
- del os.environ['PYTHONHOME']
else:
ClntOut = openutf8(TestOutFile, 'a')
ClntErr = openutf8(TestErrFile, 'a')
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
