Changeset: 3ba8e66fcad8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3ba8e66fcad8
Modified Files:
clients/RunMtest.bat.in
clients/RunMtest.in
geom/RunMtest.bat.in
geom/RunMtest.in
java/RunMtest.bat.in
java/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: default
Log Message:
add ${buildbase}/clients/mapiclient to PATH to make RunMtest find mclient
diffs (179 lines):
diff --git a/clients/RunMtest.bat.in b/clients/RunMtest.bat.in
--- a/clients/RunMtest.bat.in
+++ b/clients/RunMtest.bat.in
@@ -17,7 +17,6 @@
set PATH=%builddir%\mapiclient;%PATH%
set PATH=%builddir%\mapilib;%PATH%
-set PATH=%builddir%\python;%PATH%
set
PYTHONPATH=%srcdir%\python;%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
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:${builddir}/python:${buildbase}/testing:$PATH"
+PATH="${builddir}/mapiclient:${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
@@ -76,7 +76,7 @@
copy /y %srcdir%\..\monetdb5\modules\atoms\??_*.mal
%buildbase%\monetdb5\modules\atoms\autoload
:skip_5
-set PATH=%buildbase%\monetdb%V%\tools;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\monetdb%V%\tools;%buildbase%\clients\mapiclient;%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
@@ -77,7 +77,7 @@
# enhance various paths to find our stuff
libpath="${MOD_PATH}"
-PATH="${buildbase}/monetdb$V/tools:${buildbase}/testing:$PATH"
+PATH="${buildbase}/monetdb$V/tools:${buildbase}/clients/mapiclient:${buildbase}/testing:$PATH"
export PATH
PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
diff --git a/java/RunMtest.bat.in b/java/RunMtest.bat.in
--- a/java/RunMtest.bat.in
+++ b/java/RunMtest.bat.in
@@ -13,7 +13,7 @@
set builddir=%buildbase%\java
set srcdir=@XSOURCE@\java
-set PATH=%buildbase%\testing;%PATH%
+set PATH=%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
diff --git a/java/RunMtest.in b/java/RunMtest.in
--- a/java/RunMtest.in
+++ b/java/RunMtest.in
@@ -25,7 +25,7 @@
uname=`uname`
# enhance various paths to find our stuff
-PATH="${buildbase}/testing:$PATH"
+PATH="${buildbase}/clients/mapiclient:${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%\testing;%PATH%
+set PATH=%buildbase%\clients\mapiclient;%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
@@ -32,7 +32,7 @@
MOD_PATH="${MOD_PATH}${srcdir}/scripts/tools"
# enhance various paths to find our stuff
-binpath="${builddir}/tools:${buildbase}/testing"
+binpath="${builddir}/tools:${buildbase}/clients/mapiclient:${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%\modules\atoms\autoload mkdir
%builddir%\modules\atoms\autoload
copy /y %srcdir%\modules\atoms\??_*.mal %builddir%\modules\atoms\autoload
-set PATH=%buildbase%\testing;%PATH%
+set PATH=%buildbase%\clients\mapiclient;%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
@@ -34,7 +34,7 @@
done
# enhance various paths to find our stuff
-binpath="${builddir}/tools:${srcdir}/tools:${buildbase}/testing"
+binpath="${builddir}/tools:${srcdir}/tools:${buildbase}/clients/mapiclient:${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
@@ -62,7 +62,7 @@
copy /y %srcdir%\..\monetdb5\modules\atoms\??_*.mal
%buildbase%\monetdb5\modules\atoms\autoload
:skip_5
-set PATH=%buildbase%\monetdb%V%\tools;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\monetdb%V%\tools;%buildbase%\clients\mapiclient;%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
@@ -67,7 +67,7 @@
esac
# enhance various paths to find our stuff
-binpath="${builddir}/compiler:${builddir}/tools:${buildbase}/monetdb$V/tools:${buildbase}/testing"
+binpath="${builddir}/compiler:${builddir}/tools:${buildbase}/monetdb$V/tools:${buildbase}/clients/mapiclient:${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
@@ -44,7 +44,7 @@
if not exist %buildbase%\monetdb5\modules\atoms\autoload mkdir
%buildbase%\monetdb5\modules\atoms\autoload
copy /y %srcdir%\..\monetdb5\modules\atoms\??_*.mal
%buildbase%\monetdb5\modules\atoms\autoload
-set PATH=%buildbase%\monetdb5\tools;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\monetdb5\tools;%buildbase%\clients\mapiclient;%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
@@ -43,7 +43,7 @@
done
# enhance various paths to find our stuff
-binpath="${builddir}/backends/monet5:${buildbase}/monetdb5/tools:${buildbase}/testing"
+binpath="${builddir}/backends/monet5:${buildbase}/monetdb5/tools:${buildbase}/clients/mapiclient:${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
@@ -66,7 +66,7 @@
# enhance various paths to find our stuff
libpath="${MOD_PATH}"
-PATH="${buildbase}/monetdb$V/tools:${buildbase}/testing:$PATH"
+PATH="${buildbase}/monetdb$V/tools:${buildbase}/clients/mapiclient:${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
