Changeset: 4c4ceabef8da for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4c4ceabef8da
Modified Files:
geom/RunMtest.in
monetdb5/RunMtest.in
sql/RunMtest.in
template/RunMtest.in
Branch: default
Log Message:
Merge with Mar2011 branch.
diffs (truncated from 429 to 300 lines):
diff --git a/clients/RunMtest.in b/clients/RunMtest.in
--- a/clients/RunMtest.in
+++ b/clients/RunMtest.in
@@ -18,14 +18,12 @@
# All Rights Reserved.
pkg=clients
-buildbase=@QBUILD@
-builddir="${buildbase}/clients"
-# make sure srcdir contains absolute path name
-srcdir=`cd '@srcdir@'; pwd`
+buildbase="@QBUILD@"
+srcdir="@QSOURCE@"
uname=`uname`
# make sure scripts are executable
-for x in "${builddir}/python/monetdb/mclient.py"
+for x in "${buildbase}/clients/python/monetdb/mclient.py"
do
if [ -s $x ] ; then
chmod +x $x
@@ -33,26 +31,26 @@
done
# enhance various paths to find our stuff
-PATH="${builddir}/mapiclient:${builddir}/examples/C:${builddir}/examples/php:${builddir}/examples/python:${builddir}/perl/Tests:${buildbase}/testing:$PATH"
+PATH="${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/clients/examples/php:${buildbase}/clients/examples/python:${buildbase}/clients/perl/Tests:${buildbase}/testing:$PATH"
export PATH
-PYTHONPATH="${builddir}/python/build/lib:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/clients/python/build/lib:${buildbase}/testing:${srcdir}/testing:${PYTHONPATH}"
export PYTHONPATH
CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
export CLASSPATH
-perlib="${builddir}/perl:${srcdir}/perl"
+perlib="${buildbase}/clients/perl:${srcdir}/clients/perl"
PERLLIB="${perlib}:${PERLLIB}"
PERL5LIB="${perlib}:${PERL5LIB}"
export PERLLIB PERL5LIB
# execute Mtest.py in the source directory
-cd "$srcdir"
+cd "${srcdir}/${pkg}"
# 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 python "${buildbase}/testing/Mtest.py" --package=${pkg}
--dbfarm="${builddir}/dbfarm" --TSTTRGBASE="${builddir}" ${MTEST_AT+--at}
"${@--rq}"
+exec python "${buildbase}/testing/Mtest.py" --package=${pkg}
--dbfarm="${buildbase}/${pkg}/dbfarm" --TSTTRGBASE="${buildbase}/${pkg}"
${MTEST_AT+--at} "${@--rq}"
diff --git a/geom/RunMtest.in b/geom/RunMtest.in
--- a/geom/RunMtest.in
+++ b/geom/RunMtest.in
@@ -18,79 +18,71 @@
# All Rights Reserved.
pkg=geom
-buildbase=@QBUILD@
-builddir="${buildbase}/geom"
-# make sure srcdir contains absolute path name
-srcdir=`cd '@srcdir@'; pwd`
+buildbase="@QBUILD@"
+srcdir="@QSOURCE@"
uname=`uname`
-# M5 is default
-@HAVE_MONETDB5_TRUE@V=5
-# commandline option overrules default
-for arg
-do
- case "$arg" in
- -5) V=5;;
- esac
-done
-
-# where compiled Geom modules are to be found
-for d in 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/ 2>/dev/null
-done
-
-# enable auto-loading of SQL createdb scripts before `make install`
-MOD_PATH="${MOD_PATH}:${builddir}/sql"
-mkdir -p ${builddir}/sql/createdb
-cp -f ${srcdir}/sql/[0-9][0-9]_*.sql ${builddir}/sql/createdb/ 2>/dev/null
-
-case "$V" in
-5)
# where compiled SQL modules are to be found
for d in backends/monet5 backends/monet5/vaults sql
do
- MOD_PATH="${MOD_PATH}:${buildbase}/sql/$d/.libs:${buildbase}/sql/$d"
+ [ -d "${buildbase}/sql/$d/.libs" ] &&
+ MOD_PATH="${MOD_PATH}:${buildbase}/sql/$d/.libs"
+ MOD_PATH="${MOD_PATH}:${buildbase}/sql/$d"
# enable auto-loading of modules before `make install`
mkdir -p ${buildbase}/sql/$d/autoload
- cp -f ${srcdir}/../sql/$d/[0-9][0-9]_*.mal
${buildbase}/sql/$d/autoload/ 2>/dev/null
+ cp ${srcdir}/sql/$d/[0-9][0-9]_*.mal ${buildbase}/sql/$d/autoload/
2>/dev/null
done
# disable auto-loading of non-available modules
@HAVE_MSEED_FALSE@ rm -f
${buildbase}/sql/backends/monet5/vaults/autoload/71_mseed.mal
@HAVE_CFITSIO_FALSE@ rm -f
${buildbase}/sql/backends/monet5/vaults/autoload/72_fits.mal
+
# enable auto-loading of SQL createdb scripts before `make install`
mkdir -p ${buildbase}/sql/sql/createdb
-cp -f ${srcdir}/../sql/sql/[0-9][0-9]_*.sql ${buildbase}/sql/sql/createdb/
2>/dev/null
+cp ${srcdir}/sql/sql/[0-9][0-9]_*.sql ${buildbase}/sql/sql/createdb/
2>/dev/null
# disable auto-loading of non-available SQL createdb scripts
@HAVE_RAPTOR_FALSE@ rm -f ${buildbase}/sql/sql/createdb/30_rdf.sql
+
+# where compiled Geom modules are to be found
+for d in monetdb5
+do
+ [ -d "${buildbase}/geom/$d/.libs" ] &&
+ MOD_PATH="${MOD_PATH}:${buildbase}/geom/$d/.libs"
+ MOD_PATH="${MOD_PATH}:${buildbase}/geom/$d"
+ # enable auto-loading of modules before `make install`
+ mkdir -p ${buildbase}/geom/$d/autoload
+ cp ${srcdir}/geom/$d/[0-9][0-9]_*.mal ${buildbase}/geom/$d/autoload/
2>/dev/null
+done
+
+# enable auto-loading of SQL createdb scripts before `make install`
+mkdir -p ${buildbase}/geom/monetdb5/createdb
+cp ${srcdir}/geom/sql/[0-9][0-9]_*.sql ${buildbase}/geom/monetdb5/createdb
2>/dev/null
+
# where compiled monetdb5 modules are to be found
-for d in optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/rdf extras/xml
+for d in optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/compiler
do
-
MOD_PATH="${MOD_PATH}:${buildbase}/monetdb5/$d/.libs:${buildbase}/monetdb5/$d"
+ [ -d "${buildbase}/monetdb5/$d/.libs" ] &&
+ MOD_PATH="${MOD_PATH}:${buildbase}/monetdb5/$d"
+ MOD_PATH="${MOD_PATH}:${buildbase}/monetdb5/$d"
# enable auto-loading of modules before `make install`
mkdir -p ${buildbase}/monetdb5/$d/autoload
- cp -f ${srcdir}/../monetdb5/$d/[0-9][0-9]_*.mal
${buildbase}/monetdb5/$d/autoload/ 2>/dev/null
+ cp ${srcdir}/monetdb5/$d/[0-9][0-9]_*.mal
${buildbase}/monetdb5/$d/autoload/ 2>/dev/null
done
-PATH="${buildbase}/tools/mserver:$PATH"
-;;
-esac
# enhance various paths to find our stuff
-MOD_PATH="${MOD_PATH#:}"
-libpath="${MOD_PATH}"
-PATH="${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/clients/examples/php:${buildbase}/clients/examples/python:${buildbase}/clients/perl/Tests:${buildbase}/testing:$PATH"
+MOD_PATH="`echo ${MOD_PATH} | sed 's/^://'`"
+binpath="${buildbase}/sql/backends/monet5:${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/clients/examples/php:${buildbase}/clients/examples/python:${buildbase}/clients/perl/Tests:${buildbase}/testing"
+libpath="${MOD_PATH}:${buildbase}/sql/server/.libs"
+
+PATH="${binpath}:$PATH"
export PATH
-PYTHONPATH="${buildbase}/clients/python/build/lib:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/clients/python/build/lib:${buildbase}/testing:${srcdir}/testing:$PYTHONPATH"
export PYTHONPATH
CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
export CLASSPATH
-perlib="${buildbase}/clients/perl:${srcdir}/../clients/perl"
+perlib="${buildbase}/clients/perl:${srcdir}/clients/perl"
PERLLIB="${perlib}:${PERLLIB}"
PERL5LIB="${perlib}:${PERL5LIB}"
export PERLLIB PERL5LIB
@@ -117,11 +109,11 @@
fi
# execute Mtest.py in the source directory
-cd "$srcdir"
+cd "${srcdir}/${pkg}"
# 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 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" --package=${pkg}
--monet_mod_path="${MOD_PATH}" --dbfarm="${buildbase}/${pkg}/dbfarm"
--TSTTRGBASE="${buildbase}/${pkg}" ${MTEST_AT+--at} "${@--rq}"
diff --git a/monetdb5/RunMtest.in b/monetdb5/RunMtest.in
--- a/monetdb5/RunMtest.in
+++ b/monetdb5/RunMtest.in
@@ -18,57 +18,71 @@
# All Rights Reserved.
pkg=monetdb5
-buildbase=@QBUILD@
-builddir="${buildbase}/monetdb5"
-# make sure srcdir contains absolute path name
-srcdir=`cd '@srcdir@'; pwd`
+buildbase="@QBUILD@"
+srcdir="@QSOURCE@"
uname=`uname`
-# where compiled monetdb5 modules are to be found
-for d in optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/rdf extras/xml
-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/ 2>/dev/null
-done
-
# where compiled SQL modules are to be found
for d in backends/monet5 backends/monet5/vaults sql
do
- MOD_PATH="${MOD_PATH}:${buildbase}/sql/$d/.libs:${buildbase}/sql/$d"
+ [ -d "${buildbase}/sql/$d/.libs" ] &&
+ MOD_PATH="${MOD_PATH}:${buildbase}/sql/$d/.libs"
+ MOD_PATH="${MOD_PATH}:${buildbase}/sql/$d"
# enable auto-loading of modules before `make install`
mkdir -p ${buildbase}/sql/$d/autoload
- cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${buildbase}/sql/$d/autoload/
2>/dev/null
+ cp ${srcdir}/sql/$d/[0-9][0-9]_*.mal ${buildbase}/sql/$d/autoload/
2>/dev/null
done
# disable auto-loading of non-available modules
@HAVE_MSEED_FALSE@ rm -f
${buildbase}/sql/backends/monet5/vaults/autoload/71_mseed.mal
@HAVE_CFITSIO_FALSE@ rm -f
${buildbase}/sql/backends/monet5/vaults/autoload/72_fits.mal
+# enable auto-loading of SQL createdb scripts before `make install`
+mkdir -p ${buildbase}/sql/sql/createdb
+cp ${srcdir}/sql/sql/[0-9][0-9]_*.sql ${buildbase}/sql/sql/createdb/
2>/dev/null
+# disable auto-loading of non-available SQL createdb scripts
+@HAVE_RAPTOR_FALSE@ rm -f ${buildbase}/sql/sql/createdb/30_rdf.sql
+
# where compiled Geom modules are to be found
for d in monetdb5
do
- MOD_PATH="${MOD_PATH}:${buildbase}/geom/$d/.libs:${buildbase}/geom/$d"
+ [ -d "${buildbase}/geom/$d/.libs" ] &&
+ MOD_PATH="${MOD_PATH}:${buildbase}/geom/$d/.libs"
+ MOD_PATH="${MOD_PATH}:${buildbase}/geom/$d"
# enable auto-loading of modules before `make install`
mkdir -p ${buildbase}/geom/$d/autoload
- cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${buildbase}/geom/$d/autoload/
2>/dev/null
+ cp ${srcdir}/geom/$d/[0-9][0-9]_*.mal ${buildbase}/geom/$d/autoload/
2>/dev/null
+done
+
+# enable auto-loading of SQL createdb scripts before `make install`
+mkdir -p ${buildbase}/geom/monetdb5/createdb
+cp ${srcdir}/geom/sql/[0-9][0-9]_*.sql ${buildbase}/geom/monetdb5/createdb
2>/dev/null
+
+# where compiled monetdb5 modules are to be found
+for d in optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/compiler
+do
+ [ -d "${buildbase}/monetdb5/$d/.libs" ] &&
+ MOD_PATH="${MOD_PATH}:${buildbase}/monetdb5/$d"
+ MOD_PATH="${MOD_PATH}:${buildbase}/monetdb5/$d"
+ # enable auto-loading of modules before `make install`
+ mkdir -p ${buildbase}/monetdb5/$d/autoload
+ cp ${srcdir}/monetdb5/$d/[0-9][0-9]_*.mal
${buildbase}/monetdb5/$d/autoload/ 2>/dev/null
done
# enhance various paths to find our stuff
-MOD_PATH="${MOD_PATH#:}"
-binpath="${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/clients/examples/php:${buildbase}/clients/examples/python:${buildbase}/clients/perl/Tests:${buildbase}/testing"
-libpath="${MOD_PATH}:${builddir}/mal/.libs"
+MOD_PATH="`echo ${MOD_PATH} | sed 's/^://'`"
+binpath="${buildbase}/sql/backends/monet5:${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/clients/examples/php:${buildbase}/clients/examples/python:${buildbase}/clients/perl/Tests:${buildbase}/testing"
+libpath="${MOD_PATH}:${buildbase}/sql/server/.libs"
PATH="${binpath}:$PATH"
export PATH
-PYTHONPATH="${buildbase}/clients/python/build/lib:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/clients/python/build/lib:${buildbase}/testing:${srcdir}/testing:$PYTHONPATH"
export PYTHONPATH
CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
export CLASSPATH
-perlib="${buildbase}/clients/perl:${srcdir}/../clients/perl"
+perlib="${buildbase}/clients/perl:${srcdir}/clients/perl"
PERLLIB="${perlib}:${PERLLIB}"
PERL5LIB="${perlib}:${PERL5LIB}"
export PERLLIB PERL5LIB
@@ -95,11 +109,11 @@
fi
# execute Mtest.py in the source directory
-cd "$srcdir"
+cd "${srcdir}/${pkg}"
# 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 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" --package=${pkg}
--monet_mod_path="${MOD_PATH}" --dbfarm="${buildbase}/${pkg}/dbfarm"
--TSTTRGBASE="${buildbase}/${pkg}" ${MTEST_AT+--at} "${@--rq}"
diff --git a/sql/RunMtest.in b/sql/RunMtest.in
--- a/sql/RunMtest.in
+++ b/sql/RunMtest.in
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
