Update of /cvsroot/monetdb/sql
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24471
Modified Files:
Tag: GDK-2
RunMapprove.in RunMtest.bat.in RunMtest.in
Log Message:
propagated changes of Thursday Sep 06 2007 - Monday Sep 10 2007
from the development trunk to the GDK-2 branch
Index: RunMtest.in
===================================================================
RCS file: /cvsroot/monetdb/sql/RunMtest.in,v
retrieving revision 1.27.4.1
retrieving revision 1.27.4.2
diff -u -d -r1.27.4.1 -r1.27.4.2
--- RunMtest.in 21 Aug 2007 14:07:49 -0000 1.27.4.1
+++ RunMtest.in 10 Sep 2007 14:47:06 -0000 1.27.4.2
@@ -16,65 +16,71 @@
# Portions created by CWI are Copyright (C) 1997-2007 CWI.
# All Rights Reserved.
-builddir=`pwd`
+pkg=monetdb-sql
[EMAIL PROTECTED]@
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
uname=`uname`
-# default in MonetDB4
-version=4
-conf=MonetDB.conf
-
+# default back-end is MonetDB4
+V=4
for arg
do
case "$arg" in
- -4)
- version=4
- conf=MonetDB.conf;;
- -5)
- version=5
- conf=monetdb5.conf;;
+ -4) V=4;;
+ -5) V=5;;
esac
done
# where compiled modules are to be found
-MOD_PATH="${builddir}/src/backends/monet$version/.libs:${builddir}/src/backends/monet$version:${srcdir}/src/backends/monet$version:`monetdb$version-config
--modpath`"
+for d in src/backends/monet$V
+do
+ MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:${srcdir}/$d:"
+done
+MOD_PATH="${MOD_PATH}`monetdb$V-config --modpath`"
+
+# make sure scripts are executable
+for x in "${builddir}/conf/${pkg}-config"
+do
+ if [ -s $x ] ; then
+ chmod +x $x
+ fi
+done
+
+# enhance various paths to find our stuff
+binpath="${builddir}/conf:${builddir}/src/tools:${builddir}/src/backends/monet5"
+libpath="${MOD_PATH}:${builddir}/src/server/.libs"
+
+PATH="${binpath}:$PATH"
+export PATH
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
fi
-if [ "${uname}" = "Darwin" -a "${DYLD_LIBRARY_PATH}" ] ; then
- DYLD_LIBRARY_PATH=":${DYLD_LIBRARY_PATH}"
-fi
-if [ "${uname}" = "AIX" -a "${LIBPATH}" ] ; then
- LIBPATH=":${LIBPATH}"
-fi
-
-# enhance PATH with Msql and MonetDB binaries
-if [ -s "${builddir}/conf/monetdb-sql-config" ] ; then
- chmod +x "${builddir}/conf/monetdb-sql-config"
-fi
-PATH="${builddir}/conf:${builddir}/src/tools:$PATH"
-libpath="${MOD_PATH}:${builddir}/src/server/.libs"
LD_LIBRARY_PATH="${libpath}${LD_LIBRARY_PATH}"
+export LD_LIBRARY_PATH
+
if [ "${uname}" = "Darwin" ] ; then
+ if [ "${DYLD_LIBRARY_PATH}" ] ; then
+ DYLD_LIBRARY_PATH=":${DYLD_LIBRARY_PATH}"
+ fi
DYLD_LIBRARY_PATH="${libpath}${DYLD_LIBRARY_PATH}"
export DYLD_LIBRARY_PATH
fi
if [ "${uname}" = "AIX" ] ; then
+ if [ "${LIBPATH}" ] ; then
+ LIBPATH=":${LIBPATH}"
+ fi
LIBPATH="${libpath}${LIBPATH}"
export LIBPATH
fi
-export PATH LD_LIBRARY_PATH
# execute Mtest.py in the source directory
cd "$srcdir"
-# execute the script
+# execute the script.
# if no arguments, do a recursive test (Mtest.py -r), else pass on the
# 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 Mtest.py --config="`monetdb$version-config --sysconfdir`/$conf"
--monet_mod_path="$MOD_PATH" --dbfarm="${builddir}/dbfarm"
--sql_logdir="${builddir}/sql_logs" --xquery_logdir="${builddir}/xquery_logs"
--TSTSRCBASE="$srcdir" --TSTBLDBASE="$builddir" --TSTTRGBASE="${builddir}"
${MTEST_AT+--at} "[EMAIL PROTECTED]"
-# --SQL_PREFIX="${builddir}/src/tools"
+# 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 Mtest.py -$V --package=${pkg} --monet_mod_path="${MOD_PATH}"
--dbfarm="${builddir}/dbfarm" --sql_logdir="${builddir}/sql_logs"
--xquery_logdir="${builddir}/xquery_logs" --TSTTRGBASE="${builddir}"
${MTEST_AT+--at} "[EMAIL PROTECTED]"
Index: RunMapprove.in
===================================================================
RCS file: /cvsroot/monetdb/sql/RunMapprove.in,v
retrieving revision 1.9
retrieving revision 1.9.6.1
diff -u -d -r1.9 -r1.9.6.1
--- RunMapprove.in 5 Jan 2007 00:35:07 -0000 1.9
+++ RunMapprove.in 10 Sep 2007 14:47:05 -0000 1.9.6.1
@@ -16,22 +16,29 @@
# Portions created by CWI are Copyright (C) 1997-2007 CWI.
# All Rights Reserved.
-builddir=`pwd`
+pkg=monetdb-sql
[EMAIL PROTECTED]@
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
-# enhance various paths to find our stuff
-#
PYTHONPATH="$builddir/src/testing:$srcdir/src/testing:$builddir/src/common:$srcdir/src/mapi/clients/python"
-#export PATH PYTHONPATH
+# default back-end is MonetDB4
+V=4
+for arg
+do
+ case "$arg" in
+ -4) V=4;;
+ -5) V=5;;
+ esac
+done
+
+# enhance PATH to find ${pkg}-config
+PATH="${builddir}/conf:$PATH"
+export PATH
# execute Mapprove.py in the source directory
cd "$srcdir"
-# check python version
-type -a @PYTHON@
[EMAIL PROTECTED]@ -V
-
-# execute the script
+# execute the script.
# if no arguments, do a recursive approve (Mapprove.py -r), else pass
# on the arguments
-exec Mapprove.py --config="`monetdb4-config --sysconfdir`/MonetDB.conf"
--TSTSRCBASE="$srcdir" --TSTTRGBASE="$builddir" "[EMAIL PROTECTED]"
+exec Mapprove.py -$V --package=${pkg} --TSTTRGBASE="${builddir}" "[EMAIL
PROTECTED]"
Index: RunMtest.bat.in
===================================================================
RCS file: /cvsroot/monetdb/sql/RunMtest.bat.in,v
retrieving revision 1.19.4.1
retrieving revision 1.19.4.2
diff -u -d -r1.19.4.1 -r1.19.4.2
--- RunMtest.bat.in 21 Aug 2007 14:07:48 -0000 1.19.4.1
+++ RunMtest.bat.in 10 Sep 2007 14:47:06 -0000 1.19.4.2
@@ -28,6 +28,7 @@
set PATH=%builddir%\src\storage\bat;%PATH%
set PATH=%builddir%\src\common;%PATH%
set PATH=%builddir%\src\tools;%PATH%
+set PATH=%builddir%\src\backends\monet5;%PATH%
set PATH=%builddir%\conf;%PATH%
set [EMAIL PROTECTED]@\share\MonetDB\python;%PYTHONPATH%
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
