Changeset: 878ca721f22a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=878ca721f22a
Modified Files:
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
Branch: Mar2011
Log Message:
let RunMtest's find all modules such that `RunMtest`/`make check` yields the
same output as `Mtest.py`
diffs (156 lines):
diff --git a/monetdb4/RunMtest.bat.in b/monetdb4/RunMtest.bat.in
--- a/monetdb4/RunMtest.bat.in
+++ b/monetdb4/RunMtest.bat.in
@@ -25,6 +25,16 @@
set MOD_PATH=%MOD_PATH%;%builddir%\modules\mnetcdf
set MOD_PATH=%MOD_PATH%;%srcdir%\scripts\tools
+set MOD_PATH=%MOD_PATH%;%buildbase%\geom\monetdb4\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\geom\monetdb4
+
+set MOD_PATH=%MOD_PATH%;%buildbase%\pathfinder\runtime\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\pathfinder\runtime
+set MOD_PATH=%MOD_PATH%;%buildbase%\pathfinder\modules\pftijah\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\pathfinder\modules\pftijah
+set MOD_PATH=%MOD_PATH%;%buildbase%\pathfinder\modules\probxml\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\pathfinder\modules\probxml
+
set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\clients\examples\php;%buildbase%\clients\examples\python;%buildbase%\clients\perl\Tests;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
diff --git a/monetdb4/RunMtest.in b/monetdb4/RunMtest.in
--- a/monetdb4/RunMtest.in
+++ b/monetdb4/RunMtest.in
@@ -31,6 +31,18 @@
done
MOD_PATH="${MOD_PATH}:${srcdir}/scripts/tools"
+# where compiled Geom modules are to be found
+for d in monetdb4
+do
+ MOD_PATH="${MOD_PATH}:${buildbase}/geom/$d/.libs:${buildbase}/geom/$d"
+done
+
+# where compiled Pathfinder modules are to be found
+for d in runtime modules/pftijah modules/probxml
+do
+
MOD_PATH="${MOD_PATH}:${buildbase}/pathfinder/$d/.libs:${buildbase}/pathfinder/$d"
+done
+
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
binpath="${builddir}/tools:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/clients/examples/php:${buildbase}/clients/examples/python:${buildbase}/clients/perl/Tests:${buildbase}/testing"
diff --git a/monetdb5/RunMtest.bat.in b/monetdb5/RunMtest.bat.in
--- a/monetdb5/RunMtest.bat.in
+++ b/monetdb5/RunMtest.bat.in
@@ -36,6 +36,23 @@
if not exist %builddir%\extras\xml\autoload mkdir
%builddir%\extras\xml\autoload
copy /y %srcdir%\extras\xml\??_*.mal %builddir%\extras\xml\autoload
+set MOD_PATH=%MOD_PATH%;%buildbase%\sql\backends\monet5\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\sql\backends\monet5
+set MOD_PATH=%MOD_PATH%;%buildbase%\sql\backends\monet5\vaults\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\sql\backends\monet5\vaults
+set MOD_PATH=%MOD_PATH%;%buildbase%\sql\sql
+
+REM enable auto-loading of modules before `make install`
+if not exist %buildbase%\sql\backends\monet5\autoload mkdir
%buildbase%\sql\backends\monet5\autoload
+copy /y %srcdir%\backends\monet5\??_*.mal
%buildbase%\sql\backends\monet5\autoload
+if not exist %buildbase%\sql\backends\monet5\vaults\autoload mkdir
%buildbase%\sql\backends\monet5\vaults\autoload
+copy /y %srcdir%\backends\monet5\vaults\??_*.mal
%buildbase%\sql\backends\monet5\vaults\autoload
+if "@HAVE_MSEED_FALSE@"=="" del /y
%buildbase%\sql\backends\monet5\vaults\autoload\71_mseed.mal
+if "@HAVE_CFITSIO_FALSE@"=="" del /y
%buildbase%\sql\backends\monet5\vaults\autoload\72_fits.mal
+
+set MOD_PATH=%MOD_PATH%;%buildbase%\geom\monetdb5\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\geom\monetdb5
+
set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\clients\examples\php;%buildbase%\clients\examples\python;%buildbase%\clients\perl\Tests;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
diff --git a/monetdb5/RunMtest.in b/monetdb5/RunMtest.in
--- a/monetdb5/RunMtest.in
+++ b/monetdb5/RunMtest.in
@@ -33,6 +33,27 @@
cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${builddir}/$d/autoload/ 2>/dev/null
done
+# where compiled SQL modules are to be found
+for d in backends/monet5 backends/monet5/vaults sql
+do
+ MOD_PATH="${MOD_PATH}:${buildbase}/sql/$d/.libs:${buildbase}/sql/$d"
+ # enable auto-loading of modules before `make install`
+ mkdir -p ${buildbase}/sql/$d/autoload
+ cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${buildbase}/sql/$d/autoload/
2>/dev/null
+done
+# disable auto-loading of non-available modules
+@HAVE_MSEED_FALSE@ rm -f
${buildbase}/sql/backends/monet5/vaults/autoload/71_mseed.mal
+@HAVE_CFITSIO_FALSE@ rm -f
${buildbase}/sql/backends/monet5/vaults/autoload/72_fits.mal
+
+# where compiled Geom modules are to be found
+for d in monetdb5
+do
+ MOD_PATH="${MOD_PATH}:${buildbase}/geom/$d/.libs:${buildbase}/geom/$d"
+ # enable auto-loading of modules before `make install`
+ mkdir -p ${buildbase}/geom/$d/autoload
+ cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${buildbase}/geom/$d/autoload/
2>/dev/null
+done
+
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
binpath="${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/clients/examples/php:${buildbase}/clients/examples/python:${buildbase}/clients/perl/Tests:${buildbase}/testing"
diff --git a/pathfinder/RunMtest.bat.in b/pathfinder/RunMtest.bat.in
--- a/pathfinder/RunMtest.bat.in
+++ b/pathfinder/RunMtest.bat.in
@@ -22,6 +22,8 @@
set MOD_PATH=%MOD_PATH%;%builddir%\runtime
set MOD_PATH=%MOD_PATH%;%builddir%\modules\pftijah\.libs
set MOD_PATH=%MOD_PATH%;%builddir%\modules\pftijah
+set MOD_PATH=%MOD_PATH%;%builddir%\modules\probxml\.libs
+set MOD_PATH=%MOD_PATH%;%builddir%\modules\probxml
if not %V% == 4 goto skip_4
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\plain\.libs
diff --git a/pathfinder/RunMtest.in b/pathfinder/RunMtest.in
--- a/pathfinder/RunMtest.in
+++ b/pathfinder/RunMtest.in
@@ -41,7 +41,7 @@
done
# where compiled modules are to be found
-for d in runtime modules/pftijah
+for d in runtime modules/pftijah modules/probxml
do
MOD_PATH="${MOD_PATH}:${builddir}/$d/.libs:${builddir}/$d"
done
diff --git a/sql/RunMtest.bat.in b/sql/RunMtest.bat.in
--- a/sql/RunMtest.bat.in
+++ b/sql/RunMtest.bat.in
@@ -32,6 +32,9 @@
copy /y %srcdir%\sql\??_*.sql %builddir%\sql\createdb
if "@HAVE_RAPTOR_FALSE@"="" del /y %builddir%\sql\createdb\30_rdf.sql
+set MOD_PATH=%MOD_PATH%;%buildbase%\geom\monetdb5\.libs
+set MOD_PATH=%MOD_PATH%;%buildbase%\geom\monetdb5
+
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\optimizer\.libs
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\optimizer
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\scheduler\.libs
diff --git a/sql/RunMtest.in b/sql/RunMtest.in
--- a/sql/RunMtest.in
+++ b/sql/RunMtest.in
@@ -42,6 +42,15 @@
# disable auto-loading of non-available SQL createdb scripts
@HAVE_RAPTOR_FALSE@ rm -f ${builddir}/sql/createdb/30_rdf.sql
+# where compiled Geom modules are to be found
+for d in monetdb5
+do
+ MOD_PATH="${MOD_PATH}:${buildbase}/geom/$d/.libs:${buildbase}/geom/$d"
+ # enable auto-loading of modules before `make install`
+ mkdir -p ${buildbase}/geom/$d/autoload
+ cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${buildbase}/geom/$d/autoload/
2>/dev/null
+done
+
# where compiled monetdb5 modules are to be found
for d in optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/rdf extras/xml
do
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
