Update of /cvsroot/monetdb/geom
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25166
Modified Files:
RunMtest.in
Log Message:
use `monetdb-sql-config --modpath[45]` to find the sql module in case
sql uses different prefix than M4/5 (as e.g., with nightly testing).
Index: RunMtest.in
===================================================================
RCS file: /cvsroot/monetdb/geom/RunMtest.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- RunMtest.in 22 Aug 2007 16:23:14 -0000 1.3
+++ RunMtest.in 22 Aug 2007 20:48:38 -0000 1.4
@@ -21,8 +21,16 @@
srcdir=`cd '@srcdir@'; pwd`
uname=`uname`
+# set MonetDB-server version: 4 or 5
+V=4
+
+case "$V" in
+4) conffile=MonetDB.conf;;
+5) conffile=monetdb5.conf;;
+esac
+
# where compiled modules are to be found
-MOD_PATH="${builddir}/src/monetdb4/.libs:${builddir}/src/monetdb4:${srcdir}/src/monetdb4:`monetdb4-config
--modpath`"
+MOD_PATH="${builddir}/src/monetdb$V/.libs:${builddir}/src/monetdb$V:${srcdir}/src/monetdb$V:`monetdb$V-config
--modpath`:`monetdb-sql-config --modpath$V`"
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
@@ -59,4 +67,4 @@
# 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="`monetdb4-config --sysconfdir`/MonetDB.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]"
+exec Mtest.py -$V --config="`monetdb$V-config --sysconfdir`/$conffile"
--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]"
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
