Changeset: 69e87461c1d7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/69e87461c1d7
Modified Files:
testing/Mtest.py.in
testing/Mz.py.in
Branch: Jan2022
Log Message:
No need to set embedded options.
They are set in SingleServer files when needed.
diffs (116 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -2768,37 +2768,6 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
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'
- 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:
if env.get('MULTIFARM'):
Srvr.append('--dbextra=%s' %
os.path.join(env['GDK_DBFARM'], TSTPREF + '_transient'))
@@ -2818,16 +2787,6 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
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')
diff --git a/testing/Mz.py.in b/testing/Mz.py.in
--- a/testing/Mz.py.in
+++ b/testing/Mz.py.in
@@ -1609,37 +1609,6 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
if SERVER == "SQL":
lang="sql"
- # enable r integration in server
- if ((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@\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:
# TODO
#def create_mserver5(dbpath, timeout=0, env={}, outfile=None,
errfile=None, options=[]):
@@ -1657,16 +1626,6 @@ def DoIt(env, SERVER, CALL, TST, EXT, Te
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 -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
