Changeset: f89ad1fbcbf2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f89ad1fbcbf2
Modified Files:
testing/Mtest.py.in
Branch: default
Log Message:
Fix execution order.
diffs (43 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -33,19 +33,6 @@ import signal
import fnmatch
import glob
-try:
- import Mfilter
-except ImportError:
- try:
- import MonetDBtesting.Mfilter as Mfilter
- except ImportError:
- p = _configure(os.path.join('@QXprefix@', '@QXPYTHON2_LIBDIR@'))
- sys.path.insert(0, p)
- import MonetDBtesting.Mfilter as Mfilter
- if os.environ.has_key('PYTHONPATH'):
- p += os.pathsep + os.environ['PYTHONPATH']
- os.environ['PYTHONPATH'] = p
-
procdebug = False
verbose = False
quiet = False
@@ -122,6 +109,19 @@ def _configure(str):
str = nstr
return str
+try:
+ import Mfilter
+except ImportError:
+ try:
+ import MonetDBtesting.Mfilter as Mfilter
+ except ImportError:
+ p = _configure(os.path.join('@QXprefix@', '@QXPYTHON2_LIBDIR@'))
+ sys.path.insert(0, p)
+ import MonetDBtesting.Mfilter as Mfilter
+ if os.environ.has_key('PYTHONPATH'):
+ p += os.pathsep + os.environ['PYTHONPATH']
+ os.environ['PYTHONPATH'] = p
+
# use our own process module because it has _BufferedPipe
try:
import process
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
