Changeset: 2f6b2b373775 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2f6b2b373775
Modified Files:
MonetDB4/RunMapprove.bat.in
MonetDB4/RunMapprove.in
MonetDB4/RunMtest.bat.in
MonetDB4/RunMtest.in
MonetDB5/RunMapprove.bat.in
MonetDB5/RunMapprove.in
MonetDB5/RunMtest.bat.in
MonetDB5/RunMtest.in
clients/RunMapprove.bat.in
clients/RunMapprove.in
clients/RunMtest.bat.in
clients/RunMtest.in
geom/RunMapprove.bat.in
geom/RunMapprove.in
geom/RunMtest.bat.in
geom/RunMtest.in
java/RunMapprove.bat.in
java/RunMapprove.in
java/RunMtest.bat.in
java/RunMtest.in
pathfinder/RunMapprove.bat.in
pathfinder/RunMapprove.in
pathfinder/RunMtest.bat.in
pathfinder/RunMtest.in
sql/RunMapprove.bat.in
sql/RunMapprove.in
sql/RunMtest.bat.in
sql/RunMtest.in
template/RunMapprove.in
template/RunMtest.in
Branch: default
Log Message:
set PYTHONPATH such that `RunMtest` (and hence `make check`) finds its modules
from <builddir>/testing/src/
and likewise for `RunMapprove`
TODO:
patch imports in Mtext.py.in accordingly !??
diffs (truncated from 374 to 300 lines):
diff -r f9b4730c4be7 -r 2f6b2b373775 MonetDB4/RunMapprove.bat.in
--- a/MonetDB4/RunMapprove.bat.in Sun Jan 09 16:21:33 2011 +0100
+++ b/MonetDB4/RunMapprove.bat.in Sun Jan 09 16:31:29 2011 +0100
@@ -15,6 +15,8 @@
set PATH=%builddir%\conf;%PATH%
+set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+
REM execute Mapprove.py in the source directory
pushd %srcdir%
diff -r f9b4730c4be7 -r 2f6b2b373775 MonetDB4/RunMapprove.in
--- a/MonetDB4/RunMapprove.in Sun Jan 09 16:21:33 2011 +0100
+++ b/MonetDB4/RunMapprove.in Sun Jan 09 16:31:29 2011 +0100
@@ -27,6 +27,9 @@
PATH="${builddir}/conf:$PATH"
export PATH
+PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+export PYTHONPATH
+
# execute Mapprove.py in the source directory
cd "$srcdir"
diff -r f9b4730c4be7 -r 2f6b2b373775 MonetDB4/RunMtest.bat.in
--- a/MonetDB4/RunMtest.bat.in Sun Jan 09 16:21:33 2011 +0100
+++ b/MonetDB4/RunMtest.bat.in Sun Jan 09 16:31:29 2011 +0100
@@ -30,6 +30,8 @@
set PATH=%builddir%\src\tools;%PATH%
set PATH=%builddir%\conf;%PATH%
+set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+
REM execute Mtest.py in the source directory
pushd %srcdir%
diff -r f9b4730c4be7 -r 2f6b2b373775 MonetDB4/RunMtest.in
--- a/MonetDB4/RunMtest.in Sun Jan 09 16:21:33 2011 +0100
+++ b/MonetDB4/RunMtest.in Sun Jan 09 16:31:29 2011 +0100
@@ -46,6 +46,9 @@
PATH="${binpath}:$PATH"
export PATH
+PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+export PYTHONPATH
+
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
fi
diff -r f9b4730c4be7 -r 2f6b2b373775 MonetDB5/RunMapprove.bat.in
--- a/MonetDB5/RunMapprove.bat.in Sun Jan 09 16:21:33 2011 +0100
+++ b/MonetDB5/RunMapprove.bat.in Sun Jan 09 16:31:29 2011 +0100
@@ -15,6 +15,8 @@
set PATH=%builddir%\conf;%PATH%
+set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+
REM execute Mapprove.py in the source directory
pushd %srcdir%
diff -r f9b4730c4be7 -r 2f6b2b373775 MonetDB5/RunMapprove.in
--- a/MonetDB5/RunMapprove.in Sun Jan 09 16:21:33 2011 +0100
+++ b/MonetDB5/RunMapprove.in Sun Jan 09 16:31:29 2011 +0100
@@ -27,6 +27,9 @@
PATH="${builddir}/conf:$PATH"
export PATH
+PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+export PYTHONPATH
+
# execute Mapprove.py in the source directory
cd "$srcdir"
diff -r f9b4730c4be7 -r 2f6b2b373775 MonetDB5/RunMtest.bat.in
--- a/MonetDB5/RunMtest.bat.in Sun Jan 09 16:21:33 2011 +0100
+++ b/MonetDB5/RunMtest.bat.in Sun Jan 09 16:31:29 2011 +0100
@@ -41,6 +41,8 @@
set PATH=%builddir%\src\tools;%PATH%
set PATH=%builddir%\conf;%PATH%
+set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+
REM execute Mtest.py in the source directory
pushd %srcdir%
diff -r f9b4730c4be7 -r 2f6b2b373775 MonetDB5/RunMtest.in
--- a/MonetDB5/RunMtest.in Sun Jan 09 16:21:33 2011 +0100
+++ b/MonetDB5/RunMtest.in Sun Jan 09 16:31:29 2011 +0100
@@ -48,6 +48,9 @@
PATH="${binpath}:$PATH"
export PATH
+PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+export PYTHONPATH
+
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
fi
diff -r f9b4730c4be7 -r 2f6b2b373775 clients/RunMapprove.bat.in
--- a/clients/RunMapprove.bat.in Sun Jan 09 16:21:33 2011 +0100
+++ b/clients/RunMapprove.bat.in Sun Jan 09 16:31:29 2011 +0100
@@ -15,6 +15,8 @@
set PATH=%builddir%\conf;%PATH%
+set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+
REM execute Mapprove.py in the source directory
pushd %srcdir%
diff -r f9b4730c4be7 -r 2f6b2b373775 clients/RunMapprove.in
--- a/clients/RunMapprove.in Sun Jan 09 16:21:33 2011 +0100
+++ b/clients/RunMapprove.in Sun Jan 09 16:31:29 2011 +0100
@@ -27,6 +27,9 @@
PATH="${builddir}/conf:$PATH"
export PATH
+PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+export PYTHONPATH
+
# execute Mapprove.py in the source directory
cd "$srcdir"
diff -r f9b4730c4be7 -r 2f6b2b373775 clients/RunMtest.bat.in
--- a/clients/RunMtest.bat.in Sun Jan 09 16:21:33 2011 +0100
+++ b/clients/RunMtest.bat.in Sun Jan 09 16:31:29 2011 +0100
@@ -18,7 +18,7 @@
set PATH=%builddir%\src\mapilib;%PATH%
set PATH=%builddir%\src\python;%PATH%
-set PYTHONPATH=%srcdir%\src\python;%PYTHONPATH%
+set PYTHONPATH=%srcdir%\src\python;%buildbase%\testing\src;%PYTHONPATH%
REM execute Mtest.py in the source directory
pushd %srcdir%
diff -r f9b4730c4be7 -r 2f6b2b373775 clients/RunMtest.in
--- a/clients/RunMtest.in Sun Jan 09 16:21:33 2011 +0100
+++ b/clients/RunMtest.in Sun Jan 09 16:31:29 2011 +0100
@@ -36,7 +36,7 @@
PATH="${builddir}/conf:${builddir}/src/mapiclient:${builddir}/src/python:$PATH"
export PATH
-PYTHONPATH="${srcdir}/src/python:${PYTHONPATH}"
+PYTHONPATH="${srcdir}/src/python:${buildbase}/testing/src:${PYTHONPATH}"
export PYTHONPATH
# execute Mtest.py in the source directory
diff -r f9b4730c4be7 -r 2f6b2b373775 geom/RunMapprove.bat.in
--- a/geom/RunMapprove.bat.in Sun Jan 09 16:21:33 2011 +0100
+++ b/geom/RunMapprove.bat.in Sun Jan 09 16:31:29 2011 +0100
@@ -20,6 +20,8 @@
set PATH=%builddir%\conf;%PATH%
+set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+
REM execute Mapprove.py in the source directory
pushd %srcdir%
diff -r f9b4730c4be7 -r 2f6b2b373775 geom/RunMapprove.in
--- a/geom/RunMapprove.in Sun Jan 09 16:21:33 2011 +0100
+++ b/geom/RunMapprove.in Sun Jan 09 16:31:29 2011 +0100
@@ -37,6 +37,9 @@
PATH="${builddir}/conf:$PATH"
export PATH
+PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+export PYTHONPATH
+
# execute Mapprove.py in the source directory
cd "$srcdir"
diff -r f9b4730c4be7 -r 2f6b2b373775 geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in Sun Jan 09 16:21:33 2011 +0100
+++ b/geom/RunMtest.bat.in Sun Jan 09 16:31:29 2011 +0100
@@ -47,6 +47,8 @@
rem to find geos_c.dll
set PATH=%GEOS%\bin;%PATH%
+set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+
REM execute Mtest.py in the source directory
pushd %srcdir%
diff -r f9b4730c4be7 -r 2f6b2b373775 geom/RunMtest.in
--- a/geom/RunMtest.in Sun Jan 09 16:21:33 2011 +0100
+++ b/geom/RunMtest.in Sun Jan 09 16:31:29 2011 +0100
@@ -63,6 +63,9 @@
PATH="${binpath}:$PATH"
export PATH
+PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+export PYTHONPATH
+
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
fi
diff -r f9b4730c4be7 -r 2f6b2b373775 java/RunMapprove.bat.in
--- a/java/RunMapprove.bat.in Sun Jan 09 16:21:33 2011 +0100
+++ b/java/RunMapprove.bat.in Sun Jan 09 16:31:29 2011 +0100
@@ -15,6 +15,8 @@
set PATH=%builddir%\conf;%PATH%
+set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+
REM execute Mapprove.py in the source directory
pushd %srcdir%
diff -r f9b4730c4be7 -r 2f6b2b373775 java/RunMapprove.in
--- a/java/RunMapprove.in Sun Jan 09 16:21:33 2011 +0100
+++ b/java/RunMapprove.in Sun Jan 09 16:31:29 2011 +0100
@@ -27,6 +27,9 @@
PATH="${builddir}/conf:$PATH"
export PATH
+PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+export PYTHONPATH
+
# execute Mapprove.py in the source directory
cd "$srcdir"
diff -r f9b4730c4be7 -r 2f6b2b373775 java/RunMtest.bat.in
--- a/java/RunMtest.bat.in Sun Jan 09 16:21:33 2011 +0100
+++ b/java/RunMtest.bat.in Sun Jan 09 16:31:29 2011 +0100
@@ -15,6 +15,8 @@
set PATH=%builddir%\conf;%PATH%
+set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+
REM execute Mtest.py in the source directory
pushd %srcdir%
diff -r f9b4730c4be7 -r 2f6b2b373775 java/RunMtest.in
--- a/java/RunMtest.in Sun Jan 09 16:21:33 2011 +0100
+++ b/java/RunMtest.in Sun Jan 09 16:31:29 2011 +0100
@@ -36,6 +36,9 @@
PATH="${builddir}/conf:$PATH"
export PATH
+PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+export PYTHONPATH
+
# execute Mtest.py in the source directory
cd "$srcdir"
diff -r f9b4730c4be7 -r 2f6b2b373775 pathfinder/RunMapprove.bat.in
--- a/pathfinder/RunMapprove.bat.in Sun Jan 09 16:21:33 2011 +0100
+++ b/pathfinder/RunMapprove.bat.in Sun Jan 09 16:31:29 2011 +0100
@@ -20,6 +20,8 @@
set PATH=%builddir%\conf;%PATH%
+set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+
REM execute Mapprove.py in the source directory
pushd %srcdir%
diff -r f9b4730c4be7 -r 2f6b2b373775 pathfinder/RunMapprove.in
--- a/pathfinder/RunMapprove.in Sun Jan 09 16:21:33 2011 +0100
+++ b/pathfinder/RunMapprove.in Sun Jan 09 16:31:29 2011 +0100
@@ -43,6 +43,9 @@
PATH="${builddir}/conf:$PATH"
export PATH
+PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+export PYTHONPATH
+
# execute Mapprove.py in the source directory
cd "$srcdir"
diff -r f9b4730c4be7 -r 2f6b2b373775 pathfinder/RunMtest.bat.in
--- a/pathfinder/RunMtest.bat.in Sun Jan 09 16:21:33 2011 +0100
+++ b/pathfinder/RunMtest.bat.in Sun Jan 09 16:31:29 2011 +0100
@@ -35,6 +35,8 @@
set PATH=%builddir%\conf;%PATH%
set PATH=%builddir%\src\tools;%PATH%
+set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+
REM execute Mtest.py in the source directory
pushd %srcdir%
diff -r f9b4730c4be7 -r 2f6b2b373775 pathfinder/RunMtest.in
--- a/pathfinder/RunMtest.in Sun Jan 09 16:21:33 2011 +0100
+++ b/pathfinder/RunMtest.in Sun Jan 09 16:31:29 2011 +0100
@@ -62,6 +62,9 @@
PATH="${binpath}:$PATH"
export PATH
+PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+export PYTHONPATH
+
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
fi
diff -r f9b4730c4be7 -r 2f6b2b373775 sql/RunMapprove.bat.in
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
