Changeset: 3d9ed6602ec4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3d9ed6602ec4
Modified Files:
MonetDB4/RunMapprove.bat.in
MonetDB4/RunMapprove.in
MonetDB4/RunMtest.bat.in
MonetDB4/RunMtest.in
MonetDB5/RunMapprove.bat.in
MonetDB5/RunMapprove.in
MonetDB5/RunMtest.bat.in
MonetDB5/RunMtest.in
clients/RunMapprove.bat.in
clients/RunMapprove.in
clients/RunMtest.bat.in
clients/RunMtest.in
geom/RunMapprove.bat.in
geom/RunMapprove.in
geom/RunMtest.bat.in
geom/RunMtest.in
java/RunMapprove.bat.in
java/RunMapprove.in
java/RunMtest.bat.in
java/RunMtest.in
pathfinder/RunMapprove.bat.in
pathfinder/RunMapprove.in
pathfinder/RunMtest.bat.in
pathfinder/RunMtest.in
sql/RunMapprove.bat.in
sql/RunMapprove.in
sql/RunMtest.bat.in
sql/RunMtest.in
template/RunMapprove.in
template/RunMtest.in
Branch: default
Log Message:
make sure that RunMtest & RunMapprove use the proper TSTSRCBASE
diffs (truncated from 312 to 300 lines):
diff -r 769f6a60ae53 -r 3d9ed6602ec4 MonetDB4/RunMapprove.bat.in
--- a/MonetDB4/RunMapprove.bat.in Sun Jan 09 15:53:26 2011 +0100
+++ b/MonetDB4/RunMapprove.bat.in Sun Jan 09 15:58:35 2011 +0100
@@ -18,7 +18,7 @@
REM execute Mapprove.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\src\Mapprove.py"
"--config=%builddir%\conf\MonetDB.conf" --package=%pkg%
"--TSTTRGBASE=%builddir%" %*
+call "%buildbase%\testing\src\Mapprove.py"
"--config=%builddir%\conf\MonetDB.conf" --package=%pkg% "--TSTSRCBASE=%srcdir%"
"--TSTTRGBASE=%builddir%" %*
popd
endlocal
diff -r 769f6a60ae53 -r 3d9ed6602ec4 MonetDB4/RunMapprove.in
--- a/MonetDB4/RunMapprove.in Sun Jan 09 15:53:26 2011 +0100
+++ b/MonetDB4/RunMapprove.in Sun Jan 09 15:58:35 2011 +0100
@@ -33,4 +33,4 @@
# execute the script.
# if no arguments, do a recursive approve (Mapprove.py -r), else pass
# on the arguments
-exec python "${buildbase}/testing/src/Mapprove.py"
--config="${builddir}/conf/MonetDB.conf" --package=${pkg}
--TSTTRGBASE="${builddir}" "$...@--r}"
+exec python "${buildbase}/testing/src/Mapprove.py"
--config="${builddir}/conf/MonetDB.conf" --package=${pkg}
--TSTSRCBASE="${srcdir}" --TSTTRGBASE="${builddir}" "$...@--r}"
diff -r 769f6a60ae53 -r 3d9ed6602ec4 MonetDB4/RunMtest.bat.in
--- a/MonetDB4/RunMtest.bat.in Sun Jan 09 15:53:26 2011 +0100
+++ b/MonetDB4/RunMtest.bat.in Sun Jan 09 15:58:35 2011 +0100
@@ -33,7 +33,7 @@
REM execute Mtest.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\src\Mtest.py"
"--config=%builddir%\conf\MonetDB.conf" --package=%pkg%
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm"
"--TSTTRGBASE=%builddir%" %*
+call "%buildbase%\testing\src\Mtest.py"
"--config=%builddir%\conf\MonetDB.conf" --package=%pkg%
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm"
"--TSTSRCBASE=%srcdir%" "--TSTTRGBASE=%builddir%" %*
popd
endlocal
diff -r 769f6a60ae53 -r 3d9ed6602ec4 MonetDB4/RunMtest.in
--- a/MonetDB4/RunMtest.in Sun Jan 09 15:53:26 2011 +0100
+++ b/MonetDB4/RunMtest.in Sun Jan 09 15:58:35 2011 +0100
@@ -75,4 +75,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/src/Mtest.py"
--config="${builddir}/conf/MonetDB.conf" --package=${pkg}
--monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
--TSTTRGBASE="${builddir}" ${MTEST_AT+--at} "$...@--rq}"
+exec python "${buildbase}/testing/src/Mtest.py"
--config="${builddir}/conf/MonetDB.conf" --package=${pkg}
--monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
--TSTSRCBASE="${srcdir}" --TSTTRGBASE="${builddir}" ${MTEST_AT+--at}
"$...@--rq}"
diff -r 769f6a60ae53 -r 3d9ed6602ec4 MonetDB5/RunMapprove.bat.in
--- a/MonetDB5/RunMapprove.bat.in Sun Jan 09 15:53:26 2011 +0100
+++ b/MonetDB5/RunMapprove.bat.in Sun Jan 09 15:58:35 2011 +0100
@@ -18,7 +18,7 @@
REM execute Mapprove.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\src\Mapprove.py"
--config="%builddir%/conf/monetdb5.conf" --package=%pkg%
"--TSTTRGBASE=%builddir%" %*
+call "%buildbase%\testing\src\Mapprove.py"
--config="%builddir%/conf/monetdb5.conf" --package=%pkg%
"--TSTSRCBASE=%srcdir%" "--TSTTRGBASE=%builddir%" %*
popd
endlocal
diff -r 769f6a60ae53 -r 3d9ed6602ec4 MonetDB5/RunMapprove.in
--- a/MonetDB5/RunMapprove.in Sun Jan 09 15:53:26 2011 +0100
+++ b/MonetDB5/RunMapprove.in Sun Jan 09 15:58:35 2011 +0100
@@ -33,4 +33,4 @@
# execute the script.
# if no arguments, do a recursive approve (Mapprove.py -r), else pass
# on the arguments
-exec python "${buildbase}/testing/src/Mapprove.py"
--config="${builddir}/conf/monetdb5.conf" --package=${pkg}
--TSTTRGBASE="${builddir}" "$...@--r}"
+exec python "${buildbase}/testing/src/Mapprove.py"
--config="${builddir}/conf/monetdb5.conf" --package=${pkg}
--TSTSRCBASE="${srcdir}" --TSTTRGBASE="${builddir}" "$...@--r}"
diff -r 769f6a60ae53 -r 3d9ed6602ec4 MonetDB5/RunMtest.bat.in
--- a/MonetDB5/RunMtest.bat.in Sun Jan 09 15:53:26 2011 +0100
+++ b/MonetDB5/RunMtest.bat.in Sun Jan 09 15:58:35 2011 +0100
@@ -44,7 +44,7 @@
REM execute Mtest.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\src\Mtest.py"
--config="%builddir%\conf\monetdb5.conf" --package=%pkg%
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm"
"--TSTTRGBASE=%builddir%" %*
+call "%buildbase%\testing\src\Mtest.py"
--config="%builddir%\conf\monetdb5.conf" --package=%pkg%
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm"
"--TSTSRCBASE=%srcdir%" "--TSTTRGBASE=%builddir%" %*
popd
endlocal
diff -r 769f6a60ae53 -r 3d9ed6602ec4 MonetDB5/RunMtest.in
--- a/MonetDB5/RunMtest.in Sun Jan 09 15:53:26 2011 +0100
+++ b/MonetDB5/RunMtest.in Sun Jan 09 15:58:35 2011 +0100
@@ -77,4 +77,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/src/Mtest.py"
--config="${builddir}/conf/monetdb5.conf" --package=${pkg}
--monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
--TSTTRGBASE="${builddir}" ${MTEST_AT+--at} "$...@--rq}"
+exec python "${buildbase}/testing/src/Mtest.py"
--config="${builddir}/conf/monetdb5.conf" --package=${pkg}
--monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
--TSTSRCBASE="${srcdir}" --TSTTRGBASE="${builddir}" ${MTEST_AT+--at}
"$...@--rq}"
diff -r 769f6a60ae53 -r 3d9ed6602ec4 clients/RunMapprove.bat.in
--- a/clients/RunMapprove.bat.in Sun Jan 09 15:53:26 2011 +0100
+++ b/clients/RunMapprove.bat.in Sun Jan 09 15:58:35 2011 +0100
@@ -18,7 +18,7 @@
REM execute Mapprove.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\src\Mapprove.py" --package=%pkg%
"--TSTTRGBASE=%builddir%" %*
+call "%buildbase%\testing\src\Mapprove.py" --package=%pkg%
"--TSTSRCBASE=%srcdir%" "--TSTTRGBASE=%builddir%" %*
popd
endlocal
diff -r 769f6a60ae53 -r 3d9ed6602ec4 clients/RunMapprove.in
--- a/clients/RunMapprove.in Sun Jan 09 15:53:26 2011 +0100
+++ b/clients/RunMapprove.in Sun Jan 09 15:58:35 2011 +0100
@@ -33,4 +33,4 @@
# execute the script.
# if no arguments, do a recursive approve (Mapprove.py -r), else pass
# on the arguments
-exec python "${buildbase}/testing/src/Mapprove.py" --package=${pkg}
--TSTTRGBASE="${builddir}" "$...@--r}"
+exec python "${buildbase}/testing/src/Mapprove.py" --package=${pkg}
--TSTSRCBASE="${srcdir}" --TSTTRGBASE="${builddir}" "$...@--r}"
diff -r 769f6a60ae53 -r 3d9ed6602ec4 clients/RunMtest.bat.in
--- a/clients/RunMtest.bat.in Sun Jan 09 15:53:26 2011 +0100
+++ b/clients/RunMtest.bat.in Sun Jan 09 15:58:35 2011 +0100
@@ -23,7 +23,7 @@
REM execute Mtest.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\src\Mtest.py" --package=%pkg%
"--TSTTRGBASE=%builddir%" %*
+call "%buildbase%\testing\src\Mtest.py" --package=%pkg%
"--TSTSRCBASE=%srcdir%" "--TSTTRGBASE=%builddir%" %*
popd
endlocal
diff -r 769f6a60ae53 -r 3d9ed6602ec4 clients/RunMtest.in
--- a/clients/RunMtest.in Sun Jan 09 15:53:26 2011 +0100
+++ b/clients/RunMtest.in Sun Jan 09 15:58:35 2011 +0100
@@ -47,4 +47,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/src/Mtest.py" --package=${pkg}
--TSTTRGBASE="${builddir}" ${MTEST_AT+--at} "$...@--rq}"
+exec python "${buildbase}/testing/src/Mtest.py" --package=${pkg}
--TSTSRCBASE="${srcdir}" --TSTTRGBASE="${builddir}" ${MTEST_AT+--at}
"$...@--rq}"
diff -r 769f6a60ae53 -r 3d9ed6602ec4 geom/RunMapprove.bat.in
--- a/geom/RunMapprove.bat.in Sun Jan 09 15:53:26 2011 +0100
+++ b/geom/RunMapprove.bat.in Sun Jan 09 15:58:35 2011 +0100
@@ -23,7 +23,7 @@
REM execute Mapprove.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\src\Mapprove.py" -%V% "--package=%pkg%"
"--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+call "%buildbase%\testing\src\Mapprove.py" -%V% "--package=%pkg%"
"--TSTSRCBASE=%srcdir%" "--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5 %6 %7 %8 %9
popd
endlocal
diff -r 769f6a60ae53 -r 3d9ed6602ec4 geom/RunMapprove.in
--- a/geom/RunMapprove.in Sun Jan 09 15:53:26 2011 +0100
+++ b/geom/RunMapprove.in Sun Jan 09 15:58:35 2011 +0100
@@ -43,4 +43,4 @@
# execute the script.
# if no arguments, do a recursive approve (Mapprove.py -r), else pass
# on the arguments
-exec python "${buildbase}/testing/src/Mapprove.py" -$V --package=${pkg}
--TSTTRGBASE="${builddir}" "$...@--r}"
+exec python "${buildbase}/testing/src/Mapprove.py" -$V --package=${pkg}
--TSTSRCBASE="${srcdir}" --TSTTRGBASE="${builddir}" "$...@--r}"
diff -r 769f6a60ae53 -r 3d9ed6602ec4 geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in Sun Jan 09 15:53:26 2011 +0100
+++ b/geom/RunMtest.bat.in Sun Jan 09 15:58:35 2011 +0100
@@ -50,7 +50,7 @@
REM execute Mtest.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\src\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\src\Mtest.py" -%V% "--package=%pkg%"
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm"
"--TSTSRCBASE=%srcdir%" "--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5 %6 %7 %8 %9
popd
endlocal
diff -r 769f6a60ae53 -r 3d9ed6602ec4 geom/RunMtest.in
--- a/geom/RunMtest.in Sun Jan 09 15:53:26 2011 +0100
+++ b/geom/RunMtest.in Sun Jan 09 15:58:35 2011 +0100
@@ -92,4 +92,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/src/Mtest.py" -$V --package=${pkg}
--monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
--TSTTRGBASE="${builddir}" ${MTEST_AT+--at} "$...@--rq}"
+exec python "${buildbase}/testing/src/Mtest.py" -$V --package=${pkg}
--monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
--TSTSRCBASE="${srcdir}" --TSTTRGBASE="${builddir}" ${MTEST_AT+--at}
"$...@--rq}"
diff -r 769f6a60ae53 -r 3d9ed6602ec4 java/RunMapprove.bat.in
--- a/java/RunMapprove.bat.in Sun Jan 09 15:53:26 2011 +0100
+++ b/java/RunMapprove.bat.in Sun Jan 09 15:58:35 2011 +0100
@@ -18,7 +18,7 @@
REM execute Mapprove.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\src\Mapprove.py" --package=%pkg%
"--TSTTRGBASE=%builddir%" %*
+call "%buildbase%\testing\src\Mapprove.py" --package=%pkg%
"--TSTSRCBASE=%srcdir%" "--TSTTRGBASE=%builddir%" %*
popd
endlocal
diff -r 769f6a60ae53 -r 3d9ed6602ec4 java/RunMapprove.in
--- a/java/RunMapprove.in Sun Jan 09 15:53:26 2011 +0100
+++ b/java/RunMapprove.in Sun Jan 09 15:58:35 2011 +0100
@@ -33,4 +33,4 @@
# execute the script.
# if no arguments, do a recursive approve (Mapprove.py -r), else pass
# on the arguments
-exec python "${buildbase}/testing/src/Mapprove.py" --package=${pkg}
--TSTTRGBASE="${builddir}" "$...@--r}"
+exec python "${buildbase}/testing/src/Mapprove.py" --package=${pkg}
--TSTSRCBASE="${srcdir}" --TSTTRGBASE="${builddir}" "$...@--r}"
diff -r 769f6a60ae53 -r 3d9ed6602ec4 java/RunMtest.bat.in
--- a/java/RunMtest.bat.in Sun Jan 09 15:53:26 2011 +0100
+++ b/java/RunMtest.bat.in Sun Jan 09 15:58:35 2011 +0100
@@ -18,7 +18,7 @@
REM execute Mtest.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\src\Mtest.py" --package=%pkg%
"--TSTTRGBASE=%builddir%" %*
+call "%buildbase%\testing\src\Mtest.py" --package=%pkg%
"--TSTSRCBASE=%srcdir%" "--TSTTRGBASE=%builddir%" %*
popd
endlocal
diff -r 769f6a60ae53 -r 3d9ed6602ec4 java/RunMtest.in
--- a/java/RunMtest.in Sun Jan 09 15:53:26 2011 +0100
+++ b/java/RunMtest.in Sun Jan 09 15:58:35 2011 +0100
@@ -44,4 +44,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/src/Mtest.py" --package=${pkg}
--TSTTRGBASE="${builddir}" ${MTEST_AT+--at} "$...@--rq}"
+exec python "${buildbase}/testing/src/Mtest.py" --package=${pkg}
--TSTSRCBASE="${srcdir}" --TSTTRGBASE="${builddir}" ${MTEST_AT+--at}
"$...@--rq}"
diff -r 769f6a60ae53 -r 3d9ed6602ec4 pathfinder/RunMapprove.bat.in
--- a/pathfinder/RunMapprove.bat.in Sun Jan 09 15:53:26 2011 +0100
+++ b/pathfinder/RunMapprove.bat.in Sun Jan 09 15:58:35 2011 +0100
@@ -23,7 +23,7 @@
REM execute Mapprove.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\src\Mapprove.py" -%V% --package=%pkg%
"--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+call "%buildbase%\testing\src\Mapprove.py" -%V% --package=%pkg%
"--TSTSRCBASE=%srcdir%" "--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5 %6 %7 %8 %9
popd
endlocal
diff -r 769f6a60ae53 -r 3d9ed6602ec4 pathfinder/RunMapprove.in
--- a/pathfinder/RunMapprove.in Sun Jan 09 15:53:26 2011 +0100
+++ b/pathfinder/RunMapprove.in Sun Jan 09 15:58:35 2011 +0100
@@ -49,4 +49,4 @@
# execute the script.
# if no arguments, do a recursive approve (Mapprove.py -r), else pass
# on the arguments
-exec python "${buildbase}/testing/src/Mapprove.py" -$V --package=${pkg}
--TSTTRGBASE="${builddir}" "$...@--r}"
+exec python "${buildbase}/testing/src/Mapprove.py" -$V --package=${pkg}
--TSTSRCBASE="${srcdir}" --TSTTRGBASE="${builddir}" "$...@--r}"
diff -r 769f6a60ae53 -r 3d9ed6602ec4 pathfinder/RunMtest.bat.in
--- a/pathfinder/RunMtest.bat.in Sun Jan 09 15:53:26 2011 +0100
+++ b/pathfinder/RunMtest.bat.in Sun Jan 09 15:58:35 2011 +0100
@@ -38,7 +38,7 @@
REM execute Mtest.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\src\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\src\Mtest.py" -%V% --package=%pkg%
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm"
"--xrpc_docroot=%srcdir%\runtime\xrpc" "--TSTSRCBASE=%srcdir%"
"--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5 %6 %7 %8 %9
popd
endlocal
diff -r 769f6a60ae53 -r 3d9ed6602ec4 pathfinder/RunMtest.in
--- a/pathfinder/RunMtest.in Sun Jan 09 15:53:26 2011 +0100
+++ b/pathfinder/RunMtest.in Sun Jan 09 15:58:35 2011 +0100
@@ -91,4 +91,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/src/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/src/Mtest.py" -$V --package=${pkg}
--monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
--xrpc_docroot="${srcdir}/runtime/xrpc" --TSTSRCBASE="${srcdir}"
--TSTTRGBASE="${builddir}" ${MTEST_AT+--at} "$...@--rq}"
diff -r 769f6a60ae53 -r 3d9ed6602ec4 sql/RunMapprove.bat.in
--- a/sql/RunMapprove.bat.in Sun Jan 09 15:53:26 2011 +0100
+++ b/sql/RunMapprove.bat.in Sun Jan 09 15:58:35 2011 +0100
@@ -18,7 +18,7 @@
REM execute Mapprove.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\src\Mapprove.py" "--package=%pkg%"
"--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+call "%buildbase%\testing\src\Mapprove.py" "--package=%pkg%"
"--TSTSRCBASE=%srcdir%" "--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5 %6 %7 %8 %9
popd
endlocal
diff -r 769f6a60ae53 -r 3d9ed6602ec4 sql/RunMapprove.in
--- a/sql/RunMapprove.in Sun Jan 09 15:53:26 2011 +0100
+++ b/sql/RunMapprove.in Sun Jan 09 15:58:35 2011 +0100
@@ -33,4 +33,4 @@
# execute the script.
# if no arguments, do a recursive approve (Mapprove.py -r), else pass
# on the arguments
-exec python "${buildbase}/testing/src/Mapprove.py" --package=${pkg}
--TSTTRGBASE="${builddir}" "$...@--r}"
+exec python "${buildbase}/testing/src/Mapprove.py" --package=${pkg}
--TSTSRCBASE="${srcdir}" --TSTTRGBASE="${builddir}" "$...@--r}"
diff -r 769f6a60ae53 -r 3d9ed6602ec4 sql/RunMtest.bat.in
--- a/sql/RunMtest.bat.in Sun Jan 09 15:53:26 2011 +0100
+++ b/sql/RunMtest.bat.in Sun Jan 09 15:58:35 2011 +0100
@@ -37,7 +37,7 @@
REM execute Mtest.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\src\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\src\Mtest.py" "--package=%pkg%"
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm"
"--TSTSRCBASE=%srcdir%" "--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5 %6 %7 %8 %9
popd
endlocal
diff -r 769f6a60ae53 -r 3d9ed6602ec4 sql/RunMtest.in
--- a/sql/RunMtest.in Sun Jan 09 15:53:26 2011 +0100
+++ b/sql/RunMtest.in Sun Jan 09 15:58:35 2011 +0100
@@ -81,4 +81,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/src/Mtest.py" --package=${pkg}
--monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
--TSTTRGBASE="${builddir}" ${MTEST_AT+--at} "$...@--rq}"
+exec python "${buildbase}/testing/src/Mtest.py" --package=${pkg}
--monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
--TSTSRCBASE="${srcdir}" --TSTTRGBASE="${builddir}" ${MTEST_AT+--at}
"$...@--rq}"
diff -r 769f6a60ae53 -r 3d9ed6602ec4 template/RunMapprove.in
--- a/template/RunMapprove.in Sun Jan 09 15:53:26 2011 +0100
+++ b/template/RunMapprove.in Sun Jan 09 15:58:35 2011 +0100
@@ -43,4 +43,4 @@
# execute the script.
# if no arguments, do a recursive approve (Mapprove.py -r), else pass
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
