Changeset: a7b62fa1143f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a7b62fa1143f
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:
RunMtest: attempt to get Perl sample tests working by setting PATH & PERL(5)LIB;
does not work, yet ...
diffs (297 lines):
diff --git a/clients/RunMtest.bat.in b/clients/RunMtest.bat.in
--- a/clients/RunMtest.bat.in
+++ b/clients/RunMtest.bat.in
@@ -23,6 +23,10 @@
set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
+set perlib=%builddir%\perl;%srcdir%\perl
+set PERLLIB=%perlib%;%PERLLIB%
+set PERL5LIB=%perlib%;%PERL5LIB%
+
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
@@ -33,7 +33,7 @@
done
# enhance various paths to find our stuff
-PATH="${builddir}/mapiclient:${builddir}/examples/C:${buildbase}/testing:$PATH"
+PATH="${builddir}/mapiclient:${builddir}/examples/C:${builddir}/perl/Tests:${buildbase}/testing:$PATH"
export PATH
PYTHONPATH="${builddir}/python/build/lib:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
@@ -42,6 +42,11 @@
CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
export CLASSPATH
+perlib="${builddir}/perl:${srcdir}/perl"
+PERLLIB="${perlib}:${PERLLIB}"
+PERL5LIB="${perlib}:${PERL5LIB}"
+export PERLLIB PERL5LIB
+
# 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
@@ -94,7 +94,7 @@
set cfg=%buildbase%\monetdb5\misc\monetdb5.conf
:skip_5
-set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\clients\perl\Tests;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
@@ -105,6 +105,10 @@
set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
+set perlib=%buildbase%\clients\perl;%srcdir%\..\clients\perl
+set PERLLIB=%perlib%;%PERLLIB%
+set PERL5LIB=%perlib%;%PERL5LIB%
+
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
@@ -90,7 +90,7 @@
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
libpath="${MOD_PATH}"
-PATH="${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/testing:$PATH"
+PATH="${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/clients/perl/Tests:${buildbase}/testing:$PATH"
export PATH
PYTHONPATH="${buildbase}/clients/python/build/lib:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
@@ -99,6 +99,11 @@
CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
export CLASSPATH
+perlib="${buildbase}/clients/perl:${srcdir}/../clients/perl"
+PERLLIB="${perlib}:${PERLLIB}"
+PERL5LIB="${perlib}:${PERL5LIB}"
+export PERLLIB PERL5LIB
+
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
@@ -25,7 +25,7 @@
set MOD_PATH=%MOD_PATH%;%builddir%\modules\mnetcdf
set MOD_PATH=%MOD_PATH%;%srcdir%\scripts\tools
-set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\clients\perl\Tests;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\monet;%PATH%
@@ -35,6 +35,10 @@
set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
+set perlib=%buildbase%\clients\perl;%srcdir%\..\clients\perl
+set PERLLIB=%perlib%;%PERLLIB%
+set PERL5LIB=%perlib%;%PERL5LIB%
+
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
@@ -33,7 +33,7 @@
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
-binpath="${builddir}/tools:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/testing"
+binpath="${builddir}/tools:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/clients/perl/Tests:${buildbase}/testing"
libpath="${MOD_PATH}:${builddir}/monet/.libs"
PATH="${binpath}:$PATH"
@@ -45,6 +45,11 @@
CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
export CLASSPATH
+perlib="${buildbase}/clients/perl:${srcdir}/../clients/perl"
+PERLLIB="${perlib}:${PERLLIB}"
+PERL5LIB="${perlib}:${PERL5LIB}"
+export PERLLIB PERL5LIB
+
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
@@ -36,7 +36,7 @@
if not exist %builddir%\extras\xml\autoload mkdir
%builddir%\extras\xml\autoload
copy /y %srcdir%\extras\xml\??_*.mal %builddir%\extras\xml\autoload
-set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\clients\perl\Tests;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\mal;%PATH%
@@ -46,6 +46,10 @@
set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
+set perlib=%buildbase%\clients\perl;%srcdir%\..\clients\perl
+set PERLLIB=%perlib%;%PERLLIB%
+set PERL5LIB=%perlib%;%PERL5LIB%
+
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
@@ -35,7 +35,7 @@
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
-binpath="${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/testing"
+binpath="${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/clients/perl/Tests:${buildbase}/testing"
libpath="${MOD_PATH}:${builddir}/mal/.libs"
PATH="${binpath}:$PATH"
@@ -47,6 +47,11 @@
CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
export CLASSPATH
+perlib="${buildbase}/clients/perl:${srcdir}/../clients/perl"
+PERLLIB="${perlib}:${PERLLIB}"
+PERL5LIB="${perlib}:${PERL5LIB}"
+export PERLLIB PERL5LIB
+
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
@@ -68,7 +68,7 @@
set cfg=%buildbase%\monetdb5\misc\monetdb5.conf
:skip_5
-set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\clients\perl\Tests;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\extras\compiler;%PATH%
@@ -78,6 +78,10 @@
set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
+set perlib=%buildbase%\clients\perl;%srcdir%\..\clients\perl
+set PERLLIB=%perlib%;%PERLLIB%
+set PERL5LIB=%perlib%;%PERL5LIB%
+
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
@@ -72,7 +72,7 @@
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
-binpath="${builddir}/compiler:${builddir}/tools:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/testing"
+binpath="${builddir}/compiler:${builddir}/tools:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/clients/perl/Tests:${buildbase}/testing"
libpath="${MOD_PATH}"
PATH="${binpath}:$PATH"
@@ -84,6 +84,11 @@
CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
export CLASSPATH
+perlib="${buildbase}/clients/perl:${srcdir}/../clients/perl"
+PERLLIB="${perlib}:${PERLLIB}"
+PERL5LIB="${perlib}:${PERL5LIB}"
+export PERLLIB PERL5LIB
+
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
@@ -54,7 +54,7 @@
set cfg=%buildbase%\monetdb5\misc\monetdb5.conf
-set
PATH=%buildbase%\tools\mserver;%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\tools\mserver;%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\clients\perl\Tests;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\server;%PATH%
@@ -65,6 +65,10 @@
set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
+set perlib=%buildbase%\clients\perl;%srcdir%\..\clients\perl
+set PERLLIB=%perlib%;%PERLLIB%
+set PERL5LIB=%perlib%;%PERL5LIB%
+
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
@@ -50,7 +50,7 @@
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
-binpath="${builddir}/backends/monet5:${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/testing"
+binpath="${builddir}/backends/monet5:${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/clients/perl/Tests:${buildbase}/testing"
libpath="${MOD_PATH}:${builddir}/server/.libs"
PATH="${binpath}:$PATH"
@@ -62,6 +62,11 @@
CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
export CLASSPATH
+perlib="${buildbase}/clients/perl:${srcdir}/../clients/perl"
+PERLLIB="${perlib}:${PERLLIB}"
+PERL5LIB="${perlib}:${PERL5LIB}"
+export PERLLIB PERL5LIB
+
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
@@ -71,7 +71,7 @@
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
libpath="${MOD_PATH}"
-PATH="${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/testing:$PATH"
+PATH="${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/clients/perl/Tests:${buildbase}/testing:$PATH"
export PATH
PYTHONPATH="${buildbase}/clients/python/build/lib:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
@@ -80,6 +80,11 @@
CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
export CLASSPATH
+perlib="${buildbase}/clients/perl:${srcdir}/../clients/perl"
+PERLLIB="${perlib}:${PERLLIB}"
+PERL5LIB="${perlib}:${PERL5LIB}"
+export PERLLIB PERL5LIB
+
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
