Changeset: 91c0f6db66f0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=91c0f6db66f0
Modified Files:
geom/RunMtest.bat.in
geom/RunMtest.in
pathfinder/RunMtest.bat.in
pathfinder/RunMtest.in
sql/RunMtest.bat.in
sql/RunMtest.in
template/RunMtest.in
Branch: default
Log Message:
`make check` (RunMtest) needs to use MonetDB.conf/monetdb5.conf from build-dir
diffs (175 lines):
diff --git a/geom/RunMtest.bat.in b/geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in
+++ b/geom/RunMtest.bat.in
@@ -45,6 +45,8 @@
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\mnetcdf\.libs
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\mnetcdf
set MOD_PATH=%MOD_PATH%;%srcdir%\..\monetdb4\scripts\tools
+
+set cfg=%buildbase%\monetdb4\conf\MonetDB.conf
:skip_4
if not %V% == 5 goto skip_5
@@ -82,6 +84,8 @@
copy /y %srcdir%\..\monetdb5\modules\mal\rdf\??_*.mal
%buildbase%\monetdb5\modules\mal\rdf\autoload
if not exist %buildbase%\monetdb5\modules\atoms\autoload mkdir
%buildbase%\monetdb5\modules\atoms\autoload
copy /y %srcdir%\..\monetdb5\modules\atoms\??_*.mal
%buildbase%\monetdb5\modules\atoms\autoload
+
+set cfg=%buildbase%\monetdb5\misc\monetdb5.conf
:skip_5
set
PATH=%buildbase%\monetdb%V%\tools;%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
@@ -96,7 +100,7 @@
REM execute Mtest.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\Mtest.py" -%V% "--package=%pkg%"
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm"
"--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+call "%buildbase%\testing\Mtest.py" "--config=%cfg%" -%V% "--package=%pkg%"
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm"
"--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5 %6 %7 %8 %9
popd
endlocal
diff --git a/geom/RunMtest.in b/geom/RunMtest.in
--- a/geom/RunMtest.in
+++ b/geom/RunMtest.in
@@ -58,6 +58,7 @@
MOD_PATH="${MOD_PATH}${buildbase}/monetdb4/$d/.libs:${buildbase}/monetdb4/$d:"
done
MOD_PATH="${MOD_PATH}${srcdir}/../monetdb4/scripts/tools"
+cfg="${buildbase}/monetdb4/conf/MonetDB.conf"
;;
5)
# where compiled SQL modules are to be found
@@ -79,6 +80,7 @@
mkdir -p ${buildbase}/monetdb5/$d/autoload
cp -f ${srcdir}/../monetdb5/$d/[0-9][0-9]_*.mal
${buildbase}/monetdb5/$d/autoload/ 2>/dev/null
done
+cfg="${buildbase}/monetdb5/misc/monetdb5.conf"
;;
esac
@@ -119,4 +121,4 @@
# arguments.
# if the environment variable MTEST_AT is set (value does not matter), pass
# the --at flag to Mtest.py so that it uses the at command as a watchdog.
-exec python "${buildbase}/testing/Mtest.py" -$V --package=${pkg}
--monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
--TSTTRGBASE="${builddir}" ${MTEST_AT+--at} "${@--rq}"
+exec python "${buildbase}/testing/Mtest.py" --config="${cfg}" -$V
--package=${pkg} --monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
--TSTTRGBASE="${builddir}" ${MTEST_AT+--at} "${@--rq}"
diff --git a/pathfinder/RunMtest.bat.in b/pathfinder/RunMtest.bat.in
--- a/pathfinder/RunMtest.bat.in
+++ b/pathfinder/RunMtest.bat.in
@@ -35,6 +35,8 @@
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\mnetcdf\.libs
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb4\modules\mnetcdf
set MOD_PATH=%MOD_PATH%;%srcdir%\..\monetdb4\scripts\tools
+
+set cfg=%buildbase%\monetdb4\conf\MonetDB.conf
:skip_4
if not %V% == 5 goto skip_5
@@ -60,6 +62,8 @@
copy /y %srcdir%\..\monetdb5\extras\rdf\??_*.mal
%buildbase%\monetdb5\extras\rdf\autoload
if not exist %buildbase%\monetdb5\modules\atoms\autoload mkdir
%buildbase%\monetdb5\modules\atoms\autoload
copy /y %srcdir%\..\monetdb5\modules\atoms\??_*.mal
%buildbase%\monetdb5\modules\atoms\autoload
+
+set cfg=%buildbase%\monetdb5\misc\monetdb5.conf
:skip_5
set
PATH=%buildbase%\monetdb%V%\tools;%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
@@ -73,7 +77,7 @@
REM execute Mtest.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\Mtest.py" -%V% --package=%pkg%
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm"
"--xrpc_docroot=%srcdir%\runtime\xrpc" "--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5
%6 %7 %8 %9
+call "%buildbase%\testing\Mtest.py" "--config=%cfg%" -%V% --package=%pkg%
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm"
"--xrpc_docroot=%srcdir%\runtime\xrpc" "--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5
%6 %7 %8 %9
popd
endlocal
diff --git a/pathfinder/RunMtest.in b/pathfinder/RunMtest.in
--- a/pathfinder/RunMtest.in
+++ b/pathfinder/RunMtest.in
@@ -53,7 +53,7 @@
MOD_PATH="${MOD_PATH}${buildbase}/monetdb4/$d/.libs:${buildbase}/monetdb4/$d:"
done
MOD_PATH="${MOD_PATH}${srcdir}/../monetdb4/scripts/tools"
-;;
+cfg="${buildbase}/monetdb4/conf/MonetDB.conf"
5)
# where compiled monetdb5 modules are to be found
for d in compiler optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/rdf
@@ -63,6 +63,7 @@
mkdir -p ${buildbase}/monetdb5/$d/autoload
cp -f ${srcdir}/../monetdb5/$d/[0-9][0-9]_*.mal
${buildbase}/monetdb5/$d/autoload/ 2>/dev/null
done
+cfg="${buildbase}/monetdb5/misc/monetdb5.conf"
;;
esac
@@ -105,4 +106,4 @@
# arguments.
# if the environment variable MTEST_AT is set (value does not matter), pass
# the --at flag to Mtest.py so that it uses the at command as a watchdog.
-exec python "${buildbase}/testing/Mtest.py" -$V --package=${pkg}
--monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
--xrpc_docroot="${srcdir}/runtime/xrpc" --TSTTRGBASE="${builddir}"
${MTEST_AT+--at} "${@--rq}"
+exec python "${buildbase}/testing/Mtest.py" --config="${cfg}" -$V
--package=${pkg} --monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
--xrpc_docroot="${srcdir}/runtime/xrpc" --TSTTRGBASE="${builddir}"
${MTEST_AT+--at} "${@--rq}"
diff --git a/sql/RunMtest.bat.in b/sql/RunMtest.bat.in
--- a/sql/RunMtest.bat.in
+++ b/sql/RunMtest.bat.in
@@ -48,6 +48,8 @@
if not exist %buildbase%\monetdb5\modules\atoms\autoload mkdir
%buildbase%\monetdb5\modules\atoms\autoload
copy /y %srcdir%\..\monetdb5\modules\atoms\??_*.mal
%buildbase%\monetdb5\modules\atoms\autoload
+set cfg=%buildbase%\monetdb5\misc\monetdb5.conf
+
set
PATH=%buildbase%\monetdb5\tools;%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
@@ -60,7 +62,7 @@
REM execute Mtest.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\Mtest.py" "--package=%pkg%"
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm"
"--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+call "%buildbase%\testing\Mtest.py" "--config=%cfg%" "--package=%pkg%"
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm"
"--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5 %6 %7 %8 %9
popd
endlocal
diff --git a/sql/RunMtest.in b/sql/RunMtest.in
--- a/sql/RunMtest.in
+++ b/sql/RunMtest.in
@@ -46,6 +46,8 @@
cp -f ${srcdir}/../monetdb5/$d/[0-9][0-9]_*.mal
${buildbase}/monetdb5/$d/autoload/ 2>/dev/null
done
+cfg="${buildbase}/monetdb5/misc/monetdb5.conf"
+
# enhance various paths to find our stuff
binpath="${builddir}/backends/monet5:${buildbase}/monetdb5/tools:${buildbase}/clients/mapiclient:${buildbase}/testing"
libpath="${MOD_PATH}:${builddir}/server/.libs"
@@ -85,4 +87,4 @@
# arguments.
# if the environment variable MTEST_AT is set (value does not matter), pass
# the --at flag to Mtest.py so that it uses the at command as a watchdog.
-exec python "${buildbase}/testing/Mtest.py" --package=${pkg}
--monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
--TSTTRGBASE="${builddir}" ${MTEST_AT+--at} "${@--rq}"
+exec python "${buildbase}/testing/Mtest.py" --config="${cfg}" --package=${pkg}
--monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
--TSTTRGBASE="${builddir}" ${MTEST_AT+--at} "${@--rq}"
diff --git a/template/RunMtest.in b/template/RunMtest.in
--- a/template/RunMtest.in
+++ b/template/RunMtest.in
@@ -51,6 +51,7 @@
MOD_PATH="${MOD_PATH}${buildbase}/monetdb4/$d/.libs:${buildbase}/monetdb4/$d:"
done
MOD_PATH="${MOD_PATH}${srcdir}/../monetdb4/scripts/tools"
+cfg="${buildbase}/monetdb4/conf/MonetDB.conf"
;;
5)
# where compiled monetdb5 modules are to be found
@@ -61,6 +62,7 @@
mkdir -p ${buildbase}/monetdb5/$d/autoload
cp -f ${srcdir}/../monetdb5/$d/[0-9][0-9]_*.mal
${buildbase}/monetdb5/$d/autoload/ 2>/dev/null
done
+cfg="${buildbase}/monetdb5/misc/monetdb5.conf"
;;
esac
@@ -101,4 +103,4 @@
# arguments.
# if the environment variable MTEST_AT is set (value does not matter), pass
# the --at flag to Mtest.py so that it uses the at command as a watchdog.
-exec python "${buildbase}/testing/Mtest.py" -$V --package=${pkg}
--monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
--TSTTRGBASE="${builddir}" ${MTEST_AT+--at} "${@--rq}"
+exec python "${buildbase}/testing/Mtest.py" --config="${cfg}" -$V
--package=${pkg} --monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
--TSTTRGBASE="${builddir}" ${MTEST_AT+--at} "${@--rq}"
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
