Changeset: ad9314bab0fb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad9314bab0fb
Modified Files:
clients/RunMtest.bat.in
clients/RunMtest.in
geom/RunMtest.bat.in
geom/RunMtest.in
monetdb4/RunMtest.bat.in
monetdb4/RunMtest.in
monetdb5/RunMtest.bat.in
monetdb5/RunMtest.in
pathfinder/RunMtest.bat.in
pathfinder/RunMtest.in
sql/RunMtest.bat.in
sql/RunMtest.in
template/RunMtest.in
Branch: Mar2011
Log Message:
add <buildbase>/clients/examples/C to PATH in RunMtest{,.bat} to find C MAPI
examples also with `make check`/`RunMtest`
diffs (155 lines):
diff --git a/clients/RunMtest.bat.in b/clients/RunMtest.bat.in
--- a/clients/RunMtest.bat.in
+++ b/clients/RunMtest.bat.in
@@ -15,6 +15,7 @@
set PATH=%buildbase%\testing;%PATH%
+set PATH=%builddir%\examples\C;%PATH%
set PATH=%builddir%\mapiclient;%PATH%
set PATH=%builddir%\mapilib;%PATH%
diff --git a/clients/RunMtest.in b/clients/RunMtest.in
--- a/clients/RunMtest.in
+++ b/clients/RunMtest.in
@@ -33,7 +33,7 @@
done
# enhance various paths to find our stuff
-PATH="${builddir}/mapiclient:${buildbase}/testing:$PATH"
+PATH="${builddir}/mapiclient:${builddir}/examples/C:${buildbase}/testing:$PATH"
export PATH
PYTHONPATH="${srcdir}/python:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
diff --git a/geom/RunMtest.bat.in b/geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in
+++ b/geom/RunMtest.bat.in
@@ -94,7 +94,7 @@
set cfg=%buildbase%\monetdb5\misc\monetdb5.conf
:skip_5
-set PATH=%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
diff --git a/geom/RunMtest.in b/geom/RunMtest.in
--- a/geom/RunMtest.in
+++ b/geom/RunMtest.in
@@ -90,7 +90,7 @@
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
libpath="${MOD_PATH}"
-PATH="${buildbase}/clients/mapiclient:${buildbase}/testing:$PATH"
+PATH="${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/testing:$PATH"
export PATH
PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
diff --git a/monetdb4/RunMtest.bat.in b/monetdb4/RunMtest.bat.in
--- a/monetdb4/RunMtest.bat.in
+++ b/monetdb4/RunMtest.bat.in
@@ -25,7 +25,7 @@
set MOD_PATH=%MOD_PATH%;%builddir%\modules\mnetcdf
set MOD_PATH=%MOD_PATH%;%srcdir%\scripts\tools
-set PATH=%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\monet;%PATH%
diff --git a/monetdb4/RunMtest.in b/monetdb4/RunMtest.in
--- a/monetdb4/RunMtest.in
+++ b/monetdb4/RunMtest.in
@@ -33,7 +33,7 @@
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
-binpath="${builddir}/tools:${buildbase}/clients/mapiclient:${buildbase}/testing"
+binpath="${builddir}/tools:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/testing"
libpath="${MOD_PATH}:${builddir}/monet/.libs"
PATH="${binpath}:$PATH"
diff --git a/monetdb5/RunMtest.bat.in b/monetdb5/RunMtest.bat.in
--- a/monetdb5/RunMtest.bat.in
+++ b/monetdb5/RunMtest.bat.in
@@ -36,7 +36,7 @@
if not exist %builddir%\extras\xml\autoload mkdir
%builddir%\extras\xml\autoload
copy /y %srcdir%\extras\xml\??_*.mal %builddir%\extras\xml\autoload
-set PATH=%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\mal;%PATH%
diff --git a/monetdb5/RunMtest.in b/monetdb5/RunMtest.in
--- a/monetdb5/RunMtest.in
+++ b/monetdb5/RunMtest.in
@@ -35,7 +35,7 @@
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
-binpath="${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/testing"
+binpath="${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/testing"
libpath="${MOD_PATH}:${builddir}/mal/.libs"
PATH="${binpath}:$PATH"
diff --git a/pathfinder/RunMtest.bat.in b/pathfinder/RunMtest.bat.in
--- a/pathfinder/RunMtest.bat.in
+++ b/pathfinder/RunMtest.bat.in
@@ -68,7 +68,7 @@
set cfg=%buildbase%\monetdb5\misc\monetdb5.conf
:skip_5
-set PATH=%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\extras\compiler;%PATH%
diff --git a/pathfinder/RunMtest.in b/pathfinder/RunMtest.in
--- a/pathfinder/RunMtest.in
+++ b/pathfinder/RunMtest.in
@@ -72,7 +72,7 @@
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
-binpath="${builddir}/compiler:${builddir}/tools:${buildbase}/clients/mapiclient:${buildbase}/testing"
+binpath="${builddir}/compiler:${builddir}/tools:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/testing"
libpath="${MOD_PATH}"
PATH="${binpath}:$PATH"
diff --git a/sql/RunMtest.bat.in b/sql/RunMtest.bat.in
--- a/sql/RunMtest.bat.in
+++ b/sql/RunMtest.bat.in
@@ -54,7 +54,7 @@
set cfg=%buildbase%\monetdb5\misc\monetdb5.conf
-set
PATH=%buildbase%\tools\mserver;%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\tools\mserver;%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\server;%PATH%
diff --git a/sql/RunMtest.in b/sql/RunMtest.in
--- a/sql/RunMtest.in
+++ b/sql/RunMtest.in
@@ -50,7 +50,7 @@
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
-binpath="${builddir}/backends/monet5:${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/testing"
+binpath="${builddir}/backends/monet5:${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/testing"
libpath="${MOD_PATH}:${builddir}/server/.libs"
PATH="${binpath}:$PATH"
diff --git a/template/RunMtest.in b/template/RunMtest.in
--- a/template/RunMtest.in
+++ b/template/RunMtest.in
@@ -71,7 +71,7 @@
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
libpath="${MOD_PATH}"
-PATH="${buildbase}/clients/mapiclient:${buildbase}/testing:$PATH"
+PATH="${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/testing:$PATH"
export PATH
PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
