Changeset: 8677c60aa225 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8677c60aa225
Modified Files:
clients/RunMtest.bat.in
clients/RunMtest.in
geom/RunMtest.bat.in
geom/RunMtest.in
monetdb4/RunMtest.bat.in
monetdb4/RunMtest.in
monetdb5/RunMtest.bat.in
monetdb5/RunMtest.in
pathfinder/RunMtest.bat.in
pathfinder/RunMtest.in
sql/RunMtest.bat.in
sql/RunMtest.in
template/RunMtest.in
Branch: Mar2011
Log Message:
set CLASSPATH in RunMtest{,.bat} to find *.jar also with `make check`/`RunMtest`
diffs (163 lines):
diff --git a/clients/RunMtest.bat.in b/clients/RunMtest.bat.in
--- a/clients/RunMtest.bat.in
+++ b/clients/RunMtest.bat.in
@@ -20,6 +20,8 @@
set
PYTHONPATH=%srcdir%\python;%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
+
REM execute Mtest.py in the source directory
pushd %srcdir%
diff --git a/clients/RunMtest.in b/clients/RunMtest.in
--- a/clients/RunMtest.in
+++ b/clients/RunMtest.in
@@ -39,6 +39,9 @@
PYTHONPATH="${srcdir}/python:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
+CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
+export CLASSPATH
+
# execute Mtest.py in the source directory
cd "$srcdir"
diff --git a/geom/RunMtest.bat.in b/geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in
+++ b/geom/RunMtest.bat.in
@@ -103,6 +103,8 @@
set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
+
REM execute Mtest.py in the source directory
pushd %srcdir%
diff --git a/geom/RunMtest.in b/geom/RunMtest.in
--- a/geom/RunMtest.in
+++ b/geom/RunMtest.in
@@ -96,6 +96,9 @@
PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
+CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
+export CLASSPATH
+
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
fi
diff --git a/monetdb4/RunMtest.bat.in b/monetdb4/RunMtest.bat.in
--- a/monetdb4/RunMtest.bat.in
+++ b/monetdb4/RunMtest.bat.in
@@ -33,6 +33,8 @@
set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
+
REM execute Mtest.py in the source directory
pushd %srcdir%
diff --git a/monetdb4/RunMtest.in b/monetdb4/RunMtest.in
--- a/monetdb4/RunMtest.in
+++ b/monetdb4/RunMtest.in
@@ -42,6 +42,9 @@
PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
+CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
+export CLASSPATH
+
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
fi
diff --git a/monetdb5/RunMtest.bat.in b/monetdb5/RunMtest.bat.in
--- a/monetdb5/RunMtest.bat.in
+++ b/monetdb5/RunMtest.bat.in
@@ -44,6 +44,8 @@
set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
+
REM execute Mtest.py in the source directory
pushd %srcdir%
diff --git a/monetdb5/RunMtest.in b/monetdb5/RunMtest.in
--- a/monetdb5/RunMtest.in
+++ b/monetdb5/RunMtest.in
@@ -44,6 +44,9 @@
PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
+CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
+export CLASSPATH
+
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
fi
diff --git a/pathfinder/RunMtest.bat.in b/pathfinder/RunMtest.bat.in
--- a/pathfinder/RunMtest.bat.in
+++ b/pathfinder/RunMtest.bat.in
@@ -76,6 +76,8 @@
set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
+
REM execute Mtest.py in the source directory
pushd %srcdir%
diff --git a/pathfinder/RunMtest.in b/pathfinder/RunMtest.in
--- a/pathfinder/RunMtest.in
+++ b/pathfinder/RunMtest.in
@@ -81,6 +81,9 @@
PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
+CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
+export CLASSPATH
+
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
fi
diff --git a/sql/RunMtest.bat.in b/sql/RunMtest.bat.in
--- a/sql/RunMtest.bat.in
+++ b/sql/RunMtest.bat.in
@@ -63,6 +63,8 @@
set
PYTHONPATH=%builddir%\backends\python\monet5;%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
+
REM execute Mtest.py in the source directory
pushd %srcdir%
diff --git a/sql/RunMtest.in b/sql/RunMtest.in
--- a/sql/RunMtest.in
+++ b/sql/RunMtest.in
@@ -59,6 +59,9 @@
PYTHONPATH="${builddir}/backends/python/monet5/.libs:${builddir}/backends/python/monet5:${buildbase}/testing:${srcdir}/../testing:$PYTHONPATH"
export PYTHONPATH
+CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
+export CLASSPATH
+
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
fi
diff --git a/template/RunMtest.in b/template/RunMtest.in
--- a/template/RunMtest.in
+++ b/template/RunMtest.in
@@ -77,6 +77,9 @@
PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
+CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
+export CLASSPATH
+
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
fi
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
