Changeset: d528b96fe8d7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d528b96fe8d7
Modified Files:
MonetDB5/RunMtest.bat.in
MonetDB5/RunMtest.in
MonetDB5/src/mal/Tests/tst450.stable.out
Branch: Jun2010
Log Message:
more module loading fixes for `make check` / `sh RunMtest`
diffs (38 lines):
diff -r 29151070bfce -r d528b96fe8d7 MonetDB5/RunMtest.bat.in
--- a/MonetDB5/RunMtest.bat.in Sat Jun 12 19:36:33 2010 +0200
+++ b/MonetDB5/RunMtest.bat.in Sat Jun 12 19:48:34 2010 +0200
@@ -29,6 +29,10 @@
set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\mal\rdf\.libs
set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\mal\rdf
+REM enable auto-loading of modules before `make install`
+if not exist %builddir%\src\modules\mal\rdf\autoload mkdir
%builddir%\src\modules\mal\rdf\autoload
+copy /y %srcdir%\src\modules\mal\rdf\??_*.mal
%builddir%\src\modules\mal\rdf\autoload
+
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\src\mal;%PATH%
set PATH=%builddir%\src\tools;%PATH%
diff -r 29151070bfce -r d528b96fe8d7 MonetDB5/RunMtest.in
--- a/MonetDB5/RunMtest.in Sat Jun 12 19:36:33 2010 +0200
+++ b/MonetDB5/RunMtest.in Sat Jun 12 19:48:34 2010 +0200
@@ -27,6 +27,9 @@
for d in src/compiler src/optimizer src/scheduler src/modules/atoms
src/modules/kernel src/modules/mal src/modules/mal/crackers src/modules/mal/rdf
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
# make sure scripts are executable
diff -r 29151070bfce -r d528b96fe8d7 MonetDB5/src/mal/Tests/tst450.stable.out
--- a/MonetDB5/src/mal/Tests/tst450.stable.out Sat Jun 12 19:36:33 2010 +0200
+++ b/MonetDB5/src/mal/Tests/tst450.stable.out Sat Jun 12 19:48:34 2010 +0200
@@ -124,6 +124,7 @@
[ "pcre", nil ]
[ "pqueue", nil ]
[ "profiler", nil ]
+[ "rdf", nil ]
[ "recycle", nil ]
[ "remote", nil ]
[ "sabaoth", nil ]
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
