[prev in list] [next in list] [prev in thread] [next in thread] 

List:       monetdb-checkins
Subject:    MonetDB: default - Fix for Mtest when PYTHON2PATH and PYTHON3PAT...
From:       Mark Raasveldt <commits+m.raasveldt=cwi.nl () monetdb ! org>
Date:       2016-09-29 13:28:16
Message-ID: hg.90f959f5ecd5.1475155696.6315528441665844383 () monetdb2 ! cwi-incubator ! nl
[Download RAW message or body]

Changeset: 90f959f5ecd5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=90f959f5ecd5
Modified Files:
	testing/Mtest.py.in
Branch: default
Log Message:

Fix for Mtest when PYTHON2PATH and PYTHON3PATH are not set.


diffs (14 lines):

diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1200,8 +1200,10 @@ def PerformDir(env, testdir, testlist, B
     os.environ['TSTTRGDIR'] = TSTTRGDIR
     os.environ['RELSRCDIR'] = env['RELSRCDIR']
     os.environ['PYTHON2']   = '@QXPYTHON2@'
+    if 'PYTHON2PATH' not in os.environ: os.environ['PYTHON2PATH'] = ''
     os.environ['PYTHON2PATH'] += os.path.pathsep + \
_configure(os.path.join('@QXprefix@', '@QXPYTHON2_LIBDIR@'))  os.environ['PYTHON3']   \
= '@QXPYTHON3@' +    if 'PYTHON3PATH' not in os.environ: os.environ['PYTHON3PATH'] = \
                ''
     os.environ['PYTHON3PATH'] += os.path.pathsep + \
_configure(os.path.join('@QXprefix@', '@QXPYTHON3_LIBDIR@'))  if os.name == 'nt':
         os.environ['PYTHON2PATH'] += os.path.pathsep + \
_configure(os.path.join('@QXprefix@', 'lib', 'python2')) \
_______________________________________________ checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list


[prev in list] [next in list] [prev in thread] [next in thread]