Changeset: 9239d238c224 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9239d238c224
Modified Files:
geom/RunMtest.bat.in
geom/RunMtest.in
sql/RunMtest.bat.in
sql/RunMtest.in
Branch: Jun2010
Log Message:
re-enabling `make check` and hence nightly testing after 16 days:
Since the introduction of the new module autoloading feature,
`make check` and hence nightly testing did not work at all for sql & geom
for various reasons. Several have been fixed by fabian and myself
during the last few days (details available on personal request).
The final step should be this checkin that makes the new autoloading
of modules also possible before `make install` by have the RunMtest
script create an "autoload" directory (with proper content) in the
build tree (where the compiled modules are located).
diffs (58 lines):
diff -r 272d9c5179ea -r 9239d238c224 geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in Sat May 29 12:45:27 2010 +0200
+++ b/geom/RunMtest.bat.in Sat May 29 16:48:30 2010 +0200
@@ -36,6 +36,10 @@
set MOD_PATH=%builddir%\src\monetdb%V%;%MOD_PATH%
set MOD_PATH=%builddir%\src\monetdb%V%\.libs;%MOD_PATH%
+REM enable auto-loading of modules before `make install`
+if not exist %builddir%\src\monetdb%V%\autoload mkdir
%builddir%\src\monetdb%V%\autoload
+copy /y %srcdir%\src\monetdb%V%\??_*.mal %builddir%\src\monetdb%V%\autoload
+
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\conf;%PATH%
diff -r 272d9c5179ea -r 9239d238c224 geom/RunMtest.in
--- a/geom/RunMtest.in Sat May 29 12:45:27 2010 +0200
+++ b/geom/RunMtest.in Sat May 29 16:48:30 2010 +0200
@@ -40,9 +40,12 @@
for d in src/monetdb$V
do
MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
+ # enable auto-loading of modules before `make install`
+ mkdir -p ${builddir}/d/autoload
+ cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${builddir}/$d/autoload/
done
+MOD_PATH="${MOD_PATH}`monetdb-sql-config --modpath$V`:"
MOD_PATH="${MOD_PATH}`monetdb$V-config --modpath`"
-MOD_PATH="${MOD_PATH}:`monetdb-sql-config --modpath$V`"
# make sure scripts are executable
for x in "${builddir}/conf/${pkg}-config"
diff -r 272d9c5179ea -r 9239d238c224 sql/RunMtest.bat.in
--- a/sql/RunMtest.bat.in Sat May 29 12:45:27 2010 +0200
+++ b/sql/RunMtest.bat.in Sat May 29 16:48:30 2010 +0200
@@ -20,6 +20,10 @@
set MOD_PATH=%builddir%\src\backends\monet5;%MOD_PATH%
set MOD_PATH=%builddir%\src\backends\monet5\.libs;%MOD_PATH%
+REM enable auto-loading of modules before `make install`
+if not exist %builddir%\src\backends\monet5\autoload mkdir
%builddir%\src\backends\monet5\autoload
+copy /y %srcdir%\src\backends\monet5\??_*.mal
%builddir%\src\backends\monet5\autoload
+
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\src\server;%PATH%
set PATH=%builddir%\src\storage\bat;%PATH%
diff -r 272d9c5179ea -r 9239d238c224 sql/RunMtest.in
--- a/sql/RunMtest.in Sat May 29 12:45:27 2010 +0200
+++ b/sql/RunMtest.in Sat May 29 16:48:30 2010 +0200
@@ -27,6 +27,9 @@
for d in src/backends/monet5
do
MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
+ # enable auto-loading of modules before `make install`
+ mkdir -p ${builddir}/d/autoload
+ cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${builddir}/$d/autoload/
done
MOD_PATH="${MOD_PATH}`monetdb5-config --modpath`"
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
