Changeset: 24632a9d0632 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=24632a9d0632
Modified Files:
geom/RunMtest.in
monetdb4/RunMtest.in
monetdb5/RunMtest.in
pathfinder/RunMtest.in
sql/RunMtest.in
template/RunMtest.in
Branch: Mar2011
Log Message:
fixed MOD_PATH settings in */RunMtest.in
diffs (197 lines):
diff --git a/geom/RunMtest.in b/geom/RunMtest.in
--- a/geom/RunMtest.in
+++ b/geom/RunMtest.in
@@ -40,7 +40,7 @@
# where compiled Geom modules are to be found
for d in monetdb$V
do
- MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
+ 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
@@ -55,9 +55,9 @@
# where compiled monetdb4 modules are to be found
for d in modules/plain modules/contrib modules/calibrator modules/mapi
@HAVE_NETCDF_TRUE@ modules/mnetcdf
do
-
MOD_PATH="${MOD_PATH}${buildbase}/monetdb4/$d/.libs:${buildbase}/monetdb4/$d:"
+
MOD_PATH="${MOD_PATH}:${buildbase}/monetdb4/$d/.libs:${buildbase}/monetdb4/$d"
done
-MOD_PATH="${MOD_PATH}${srcdir}/../monetdb4/scripts/tools"
+MOD_PATH="${MOD_PATH}:${srcdir}/../monetdb4/scripts/tools"
PATH="${buildbase}/monetdb4/tools:$PATH"
cfg="${buildbase}/monetdb4/conf/MonetDB.conf"
;;
@@ -65,7 +65,7 @@
# 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:"
+ MOD_PATH="${MOD_PATH}:${buildbase}/sql/$d/.libs:${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
@@ -76,7 +76,7 @@
# 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}${buildbase}/monetdb5/$d/.libs:${buildbase}/monetdb5/$d:"
+
MOD_PATH="${MOD_PATH}:${buildbase}/monetdb5/$d/.libs:${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
@@ -87,6 +87,7 @@
esac
# enhance various paths to find our stuff
+MOD_PATH="${MOD_PATH#:}"
libpath="${MOD_PATH}"
PATH="${buildbase}/clients/mapiclient:${buildbase}/testing:$PATH"
export PATH
diff --git a/monetdb4/RunMtest.in b/monetdb4/RunMtest.in
--- a/monetdb4/RunMtest.in
+++ b/monetdb4/RunMtest.in
@@ -27,11 +27,12 @@
# where compiled monetdb4 modules are to be found
for d in modules/plain modules/contrib modules/calibrator mapi
@HAVE_NETCDF_TRUE@ modules/mnetcdf
do
- MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
+ MOD_PATH="${MOD_PATH}:${builddir}/$d/.libs:${builddir}/$d"
done
-MOD_PATH="${MOD_PATH}${srcdir}/scripts/tools"
+MOD_PATH="${MOD_PATH}:${srcdir}/scripts/tools"
# enhance various paths to find our stuff
+MOD_PATH="${MOD_PATH#:}"
binpath="${builddir}/tools:${buildbase}/clients/mapiclient:${buildbase}/testing"
libpath="${MOD_PATH}:${builddir}/monet/.libs"
diff --git a/monetdb5/RunMtest.in b/monetdb5/RunMtest.in
--- a/monetdb5/RunMtest.in
+++ b/monetdb5/RunMtest.in
@@ -27,13 +27,14 @@
# 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:"
+ 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
# enhance various paths to find our stuff
+MOD_PATH="${MOD_PATH#:}"
binpath="${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/testing"
libpath="${MOD_PATH}:${builddir}/mal/.libs"
diff --git a/pathfinder/RunMtest.in b/pathfinder/RunMtest.in
--- a/pathfinder/RunMtest.in
+++ b/pathfinder/RunMtest.in
@@ -43,16 +43,16 @@
# where compiled modules are to be found
for d in runtime modules/pftijah
do
- MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
+ MOD_PATH="${MOD_PATH}:${builddir}/$d/.libs:${builddir}/$d"
done
case "$V" in
4)
# where compiled monetdb4 modules are to be found
for d in modules/plain modules/contrib modules/calibrator modules/mapi
@HAVE_NETCDF_TRUE@ modules/mnetcdf
do
-
MOD_PATH="${MOD_PATH}${buildbase}/monetdb4/$d/.libs:${buildbase}/monetdb4/$d:"
+
MOD_PATH="${MOD_PATH}:${buildbase}/monetdb4/$d/.libs:${buildbase}/monetdb4/$d"
done
-MOD_PATH="${MOD_PATH}${srcdir}/../monetdb4/scripts/tools"
+MOD_PATH="${MOD_PATH}:${srcdir}/../monetdb4/scripts/tools"
PATH="${buildbase}/monetdb4/tools:$PATH"
cfg="${buildbase}/monetdb4/conf/MonetDB.conf"
;;
@@ -60,7 +60,7 @@
# 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}${buildbase}/monetdb5/$d/.libs:${buildbase}/monetdb5/$d:"
+
MOD_PATH="${MOD_PATH}:${buildbase}/monetdb5/$d/.libs:${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
@@ -71,6 +71,7 @@
esac
# enhance various paths to find our stuff
+MOD_PATH="${MOD_PATH#:}"
binpath="${builddir}/compiler:${builddir}/tools:${buildbase}/clients/mapiclient:${buildbase}/testing"
libpath="${MOD_PATH}"
diff --git a/sql/RunMtest.in b/sql/RunMtest.in
--- a/sql/RunMtest.in
+++ b/sql/RunMtest.in
@@ -27,7 +27,7 @@
# where compiled SQL modules are to be found
for d in backends/monet5 backends/monet5/vaults sql
do
- MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
+ 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
@@ -40,7 +40,7 @@
# 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}${buildbase}/monetdb5/$d/.libs:${buildbase}/monetdb5/$d:"
+
MOD_PATH="${MOD_PATH}:${buildbase}/monetdb5/$d/.libs:${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
@@ -49,6 +49,7 @@
cfg="${buildbase}/monetdb5/misc/monetdb5.conf"
# enhance various paths to find our stuff
+MOD_PATH="${MOD_PATH#:}"
binpath="${builddir}/backends/monet5:${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/testing"
libpath="${MOD_PATH}:${builddir}/server/.libs"
diff --git a/template/RunMtest.in b/template/RunMtest.in
--- a/template/RunMtest.in
+++ b/template/RunMtest.in
@@ -40,7 +40,7 @@
# where compiled Pathfinder modules are to be found
for d in src/monetdb$V
do
- MOD_PATH="${MOD_PATH}${builddir}/$d/.libs:${builddir}/$d:"
+ MOD_PATH="${MOD_PATH}:${builddir}/$d/.libs:${builddir}/$d"
done
case "$V" in
@@ -48,9 +48,9 @@
# where compiled monetdb4 modules are to be found
for d in modules/plain modules/contrib modules/calibrator modules/mapi
@HAVE_NETCDF_TRUE@ modules/mnetcdf
do
-
MOD_PATH="${MOD_PATH}${buildbase}/monetdb4/$d/.libs:${buildbase}/monetdb4/$d:"
+
MOD_PATH="${MOD_PATH}:${buildbase}/monetdb4/$d/.libs:${buildbase}/monetdb4/$d"
done
-MOD_PATH="${MOD_PATH}${srcdir}/../monetdb4/scripts/tools"
+MOD_PATH="${MOD_PATH}:${srcdir}/../monetdb4/scripts/tools"
PATH="${buildbase}/monetdb4/tools:$PATH"
cfg="${buildbase}/monetdb4/conf/MonetDB.conf"
;;
@@ -58,7 +58,7 @@
# 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}${buildbase}/monetdb5/$d/.libs:${buildbase}/monetdb5/$d:"
+
MOD_PATH="${MOD_PATH}:${buildbase}/monetdb5/$d/.libs:${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
@@ -69,6 +69,7 @@
esac
# enhance various paths to find our stuff
+MOD_PATH="${MOD_PATH#:}"
libpath="${MOD_PATH}"
PATH="${buildbase}/clients/mapiclient:${buildbase}/testing:$PATH"
export PATH
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
