MonetDB: mtest - use local path to the MonetDBtesting module

[Niels Nes]

Changeset: 1a73f6098969 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1a73f6098969
Modified Files:
        testing/Mz.py.in
Branch: mtest
Log Message:

use local path to the MonetDBtesting module


diffs (31 lines):

diff --git a/testing/Mz.py.in b/testing/Mz.py.in
--- a/testing/Mz.py.in
+++ b/testing/Mz.py.in
@@ -32,7 +32,6 @@ import struct
 import signal
 import fnmatch
 import glob
-from MonetDBtesting.helpers import build_work_ctx
 
 try:
     import winreg               # Python 3 on Windows
@@ -213,6 +212,19 @@ def _configure(str):
     return str
 
 try:
+    from helpers import build_work_ctx
+except ImportError:
+    try:
+        from MonetDBtesting.helpers import build_work_ctx
+    except ImportError:
+        p = _configure(os.path.join('@QXprefix@', '@QXPYTHON_LIBDIR@'))
+        sys.path.insert(0, p)
+        from MonetDBtesting.helpers import build_work_ctx
+        if 'PYTHONPATH' in os.environ:
+            p += os.pathsep + os.environ['PYTHONPATH']
+        os.environ['PYTHONPATH'] = p
+
+try:
     import Mfilter
 except ImportError:
     try:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list