Changeset: d381d2e7237e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d381d2e7237e
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
template/RunMapprove.in
template/RunMtest.in
testing/src/Mtest.py.in
Branch: default
Log Message:
make sure `RunMtest` (and thus `make check`) find our python modules in build-
& source-dir
i.e., before they have been install to prefix-dir
likewise for `RunMapprove`
diffs (truncated from 429 to 300 lines):
diff -r 483f38f30871 -r d381d2e7237e MonetDB4/RunMapprove.bat.in
--- a/MonetDB4/RunMapprove.bat.in Mon Jan 10 17:29:10 2011 +0100
+++ b/MonetDB4/RunMapprove.bat.in Tue Jan 11 00:02:17 2011 +0100
@@ -13,7 +13,7 @@
set builddir=%buildbase%\MonetDB4
set srcd...@xsource@\MonetDB4
-set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+set PYTHONPATH=%buildbase%\testing\src;%srcdir%\..\testing\src;%PYTHONPATH%
REM execute Mapprove.py in the source directory
pushd %srcdir%
diff -r 483f38f30871 -r d381d2e7237e MonetDB4/RunMapprove.in
--- a/MonetDB4/RunMapprove.in Mon Jan 10 17:29:10 2011 +0100
+++ b/MonetDB4/RunMapprove.in Tue Jan 11 00:02:17 2011 +0100
@@ -23,7 +23,7 @@
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
-PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
export PYTHONPATH
# execute Mapprove.py in the source directory
diff -r 483f38f30871 -r d381d2e7237e MonetDB4/RunMtest.bat.in
--- a/MonetDB4/RunMtest.bat.in Mon Jan 10 17:29:10 2011 +0100
+++ b/MonetDB4/RunMtest.bat.in Tue Jan 11 00:02:17 2011 +0100
@@ -29,7 +29,7 @@
set PATH=%builddir%\src\monet;%PATH%
set PATH=%builddir%\src\tools;%PATH%
-set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+set PYTHONPATH=%buildbase%\testing\src;%srcdir%\..\testing\src;%PYTHONPATH%
REM execute Mtest.py in the source directory
pushd %srcdir%
diff -r 483f38f30871 -r d381d2e7237e MonetDB4/RunMtest.in
--- a/MonetDB4/RunMtest.in Mon Jan 10 17:29:10 2011 +0100
+++ b/MonetDB4/RunMtest.in Tue Jan 11 00:02:17 2011 +0100
@@ -38,7 +38,7 @@
PATH="${binpath}:$PATH"
export PATH
-PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
export PYTHONPATH
if [ "${LD_LIBRARY_PATH}" ] ; then
diff -r 483f38f30871 -r d381d2e7237e MonetDB5/RunMapprove.bat.in
--- a/MonetDB5/RunMapprove.bat.in Mon Jan 10 17:29:10 2011 +0100
+++ b/MonetDB5/RunMapprove.bat.in Tue Jan 11 00:02:17 2011 +0100
@@ -13,7 +13,7 @@
set builddir=%buildbase%\MonetDB5
set srcd...@xsource@\MonetDB5
-set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+set PYTHONPATH=%buildbase%\testing\src;%srcdir%\..\testing\src;%PYTHONPATH%
REM execute Mapprove.py in the source directory
pushd %srcdir%
diff -r 483f38f30871 -r d381d2e7237e MonetDB5/RunMapprove.in
--- a/MonetDB5/RunMapprove.in Mon Jan 10 17:29:10 2011 +0100
+++ b/MonetDB5/RunMapprove.in Tue Jan 11 00:02:17 2011 +0100
@@ -23,7 +23,7 @@
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
-PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
export PYTHONPATH
# execute Mapprove.py in the source directory
diff -r 483f38f30871 -r d381d2e7237e MonetDB5/RunMtest.bat.in
--- a/MonetDB5/RunMtest.bat.in Mon Jan 10 17:29:10 2011 +0100
+++ b/MonetDB5/RunMtest.bat.in Tue Jan 11 00:02:17 2011 +0100
@@ -40,7 +40,7 @@
set PATH=%builddir%\src\mal;%PATH%
set PATH=%builddir%\src\tools;%PATH%
-set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+set PYTHONPATH=%buildbase%\testing\src;%srcdir%\..\testing\src;%PYTHONPATH%
REM execute Mtest.py in the source directory
pushd %srcdir%
diff -r 483f38f30871 -r d381d2e7237e MonetDB5/RunMtest.in
--- a/MonetDB5/RunMtest.in Mon Jan 10 17:29:10 2011 +0100
+++ b/MonetDB5/RunMtest.in Tue Jan 11 00:02:17 2011 +0100
@@ -40,7 +40,7 @@
PATH="${binpath}:$PATH"
export PATH
-PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
export PYTHONPATH
if [ "${LD_LIBRARY_PATH}" ] ; then
diff -r 483f38f30871 -r d381d2e7237e clients/RunMapprove.bat.in
--- a/clients/RunMapprove.bat.in Mon Jan 10 17:29:10 2011 +0100
+++ b/clients/RunMapprove.bat.in Tue Jan 11 00:02:17 2011 +0100
@@ -13,7 +13,7 @@
set builddir=%buildbase%\clients
set srcd...@xsource@\clients
-set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+set PYTHONPATH=%buildbase%\testing\src;%srcdir%\..\testing\src;%PYTHONPATH%
REM execute Mapprove.py in the source directory
pushd %srcdir%
diff -r 483f38f30871 -r d381d2e7237e clients/RunMapprove.in
--- a/clients/RunMapprove.in Mon Jan 10 17:29:10 2011 +0100
+++ b/clients/RunMapprove.in Tue Jan 11 00:02:17 2011 +0100
@@ -23,7 +23,7 @@
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
-PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
export PYTHONPATH
# execute Mapprove.py in the source directory
diff -r 483f38f30871 -r d381d2e7237e clients/RunMtest.bat.in
--- a/clients/RunMtest.bat.in Mon Jan 10 17:29:10 2011 +0100
+++ b/clients/RunMtest.bat.in Tue Jan 11 00:02:17 2011 +0100
@@ -17,7 +17,7 @@
set PATH=%builddir%\src\mapilib;%PATH%
set PATH=%builddir%\src\python;%PATH%
-set PYTHONPATH=%srcdir%\src\python;%buildbase%\testing\src;%PYTHONPATH%
+set
PYTHONPATH=%srcdir%\src\python;%buildbase%\testing\src;%srcdir%\..\testing\src;%PYTHONPATH%
REM execute Mtest.py in the source directory
pushd %srcdir%
diff -r 483f38f30871 -r d381d2e7237e clients/RunMtest.in
--- a/clients/RunMtest.in Mon Jan 10 17:29:10 2011 +0100
+++ b/clients/RunMtest.in Tue Jan 11 00:02:17 2011 +0100
@@ -36,7 +36,7 @@
PATH="${builddir}/src/mapiclient:${builddir}/src/python:$PATH"
export PATH
-PYTHONPATH="${srcdir}/src/python:${buildbase}/testing/src:${PYTHONPATH}"
+PYTHONPATH="${srcdir}/src/python:${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
export PYTHONPATH
# execute Mtest.py in the source directory
diff -r 483f38f30871 -r d381d2e7237e geom/RunMapprove.bat.in
--- a/geom/RunMapprove.bat.in Mon Jan 10 17:29:10 2011 +0100
+++ b/geom/RunMapprove.bat.in Tue Jan 11 00:02:17 2011 +0100
@@ -18,7 +18,7 @@
set builddir=%buildbase%\geom
set srcd...@xsource@\geom
-set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+set PYTHONPATH=%buildbase%\testing\src;%srcdir%\..\testing\src;%PYTHONPATH%
REM execute Mapprove.py in the source directory
pushd %srcdir%
diff -r 483f38f30871 -r d381d2e7237e geom/RunMapprove.in
--- a/geom/RunMapprove.in Mon Jan 10 17:29:10 2011 +0100
+++ b/geom/RunMapprove.in Tue Jan 11 00:02:17 2011 +0100
@@ -33,7 +33,7 @@
esac
done
-PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
export PYTHONPATH
# execute Mapprove.py in the source directory
diff -r 483f38f30871 -r d381d2e7237e geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in Mon Jan 10 17:29:10 2011 +0100
+++ b/geom/RunMtest.bat.in Tue Jan 11 00:02:17 2011 +0100
@@ -81,7 +81,7 @@
rem to find geos_c.dll
set PATH=%GEOS%\bin;%PATH%
-set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+set PYTHONPATH=%buildbase%\testing\src;%srcdir%\..\testing\src;%PYTHONPATH%
REM execute Mtest.py in the source directory
pushd %srcdir%
diff -r 483f38f30871 -r d381d2e7237e geom/RunMtest.in
--- a/geom/RunMtest.in Mon Jan 10 17:29:10 2011 +0100
+++ b/geom/RunMtest.in Tue Jan 11 00:02:17 2011 +0100
@@ -78,7 +78,7 @@
# enhance various paths to find our stuff
libpath="${MOD_PATH}"
-PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
export PYTHONPATH
if [ "${LD_LIBRARY_PATH}" ] ; then
diff -r 483f38f30871 -r d381d2e7237e java/RunMapprove.bat.in
--- a/java/RunMapprove.bat.in Mon Jan 10 17:29:10 2011 +0100
+++ b/java/RunMapprove.bat.in Tue Jan 11 00:02:17 2011 +0100
@@ -13,7 +13,7 @@
set builddir=%buildbase%\java
set srcd...@xsource@\java
-set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+set PYTHONPATH=%buildbase%\testing\src;%srcdir%\..\testing\src;%PYTHONPATH%
REM execute Mapprove.py in the source directory
pushd %srcdir%
diff -r 483f38f30871 -r d381d2e7237e java/RunMapprove.in
--- a/java/RunMapprove.in Mon Jan 10 17:29:10 2011 +0100
+++ b/java/RunMapprove.in Tue Jan 11 00:02:17 2011 +0100
@@ -23,7 +23,7 @@
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
-PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
export PYTHONPATH
# execute Mapprove.py in the source directory
diff -r 483f38f30871 -r d381d2e7237e java/RunMtest.bat.in
--- a/java/RunMtest.bat.in Mon Jan 10 17:29:10 2011 +0100
+++ b/java/RunMtest.bat.in Tue Jan 11 00:02:17 2011 +0100
@@ -13,7 +13,7 @@
set builddir=%buildbase%\java
set srcd...@xsource@\java
-set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+set PYTHONPATH=%buildbase%\testing\src;%srcdir%\..\testing\src;%PYTHONPATH%
REM execute Mtest.py in the source directory
pushd %srcdir%
diff -r 483f38f30871 -r d381d2e7237e java/RunMtest.in
--- a/java/RunMtest.in Mon Jan 10 17:29:10 2011 +0100
+++ b/java/RunMtest.in Tue Jan 11 00:02:17 2011 +0100
@@ -24,7 +24,7 @@
srcdir=`cd '@srcdir@'; pwd`
uname=`uname`
-PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
export PYTHONPATH
# execute Mtest.py in the source directory
diff -r 483f38f30871 -r d381d2e7237e pathfinder/RunMapprove.bat.in
--- a/pathfinder/RunMapprove.bat.in Mon Jan 10 17:29:10 2011 +0100
+++ b/pathfinder/RunMapprove.bat.in Tue Jan 11 00:02:17 2011 +0100
@@ -18,7 +18,7 @@
set builddir=%buildbase%\pathfinder
set srcd...@xsource@\pathfinder
-set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+set PYTHONPATH=%buildbase%\testing\src;%srcdir%\..\testing\src;%PYTHONPATH%
REM execute Mapprove.py in the source directory
pushd %srcdir%
diff -r 483f38f30871 -r d381d2e7237e pathfinder/RunMapprove.in
--- a/pathfinder/RunMapprove.in Mon Jan 10 17:29:10 2011 +0100
+++ b/pathfinder/RunMapprove.in Tue Jan 11 00:02:17 2011 +0100
@@ -39,7 +39,7 @@
esac
done
-PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
export PYTHONPATH
# execute Mapprove.py in the source directory
diff -r 483f38f30871 -r d381d2e7237e pathfinder/RunMtest.bat.in
--- a/pathfinder/RunMtest.bat.in Mon Jan 10 17:29:10 2011 +0100
+++ b/pathfinder/RunMtest.bat.in Tue Jan 11 00:02:17 2011 +0100
@@ -66,7 +66,7 @@
set PATH=%builddir%\compiler;%PATH%
set PATH=%builddir%\src\tools;%PATH%
-set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+set PYTHONPATH=%buildbase%\testing\src;%srcdir%\..\testing\src;%PYTHONPATH%
REM execute Mtest.py in the source directory
pushd %srcdir%
diff -r 483f38f30871 -r d381d2e7237e pathfinder/RunMtest.in
--- a/pathfinder/RunMtest.in Mon Jan 10 17:29:10 2011 +0100
+++ b/pathfinder/RunMtest.in Tue Jan 11 00:02:17 2011 +0100
@@ -73,7 +73,7 @@
PATH="${binpath}:$PATH"
export PATH
-PYTHONPATH="${buildbase}/testing/src:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
export PYTHONPATH
if [ "${LD_LIBRARY_PATH}" ] ; then
diff -r 483f38f30871 -r d381d2e7237e sql/RunMapprove.bat.in
--- a/sql/RunMapprove.bat.in Mon Jan 10 17:29:10 2011 +0100
+++ b/sql/RunMapprove.bat.in Tue Jan 11 00:02:17 2011 +0100
@@ -13,7 +13,7 @@
set builddir=%buildbase%\sql
set srcd...@xsource@\sql
-set PYTHONPATH=%buildbase%\testing\src;%PYTHONPATH%
+set PYTHONPATH=%buildbase%\testing\src;%srcdir%\..\testing\src;%PYTHONPATH%
REM execute Mapprove.py in the source directory
pushd %srcdir%
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
