Changeset: f04d1432d576 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f04d1432d576
Modified Files:
NT/wincompile.py
buildtools/conf/MonetDB.m4
clients/RunMapprove.bat.in
clients/RunMapprove.in
clients/RunMtest.bat.in
clients/RunMtest.in
geom/RunMapprove.bat.in
geom/RunMapprove.in
geom/RunMtest.bat.in
geom/RunMtest.in
java/RunMapprove.bat.in
java/RunMapprove.in
java/RunMtest.bat.in
java/RunMtest.in
monetdb4/RunMapprove.bat.in
monetdb4/RunMapprove.in
monetdb4/RunMtest.bat.in
monetdb4/RunMtest.in
monetdb5/RunMapprove.bat.in
monetdb5/RunMapprove.in
monetdb5/RunMtest.bat.in
monetdb5/RunMtest.in
pathfinder/RunMapprove.bat.in
pathfinder/RunMapprove.in
pathfinder/RunMtest.bat.in
pathfinder/RunMtest.in
sql/RunMapprove.bat.in
sql/RunMapprove.in
sql/RunMtest.bat.in
sql/RunMtest.in
template/RunMapprove.in
template/RunMtest.in
testing/Makefile.ag
testing/Mdiff.c
testing/Mfilter.py.in
testing/MkillUsers.in
testing/Mlog.bat
testing/Mlog.in
testing/Mtest.py.bat
testing/Mtest.py.in
testing/Mtimeout.c
testing/__init__.py
testing/cmptests.py
testing/difflib.c
testing/difflib.h
testing/helpers.c
testing/helpers.h
testing/monet_options.py.in
testing/process.py
testing/quicktest
testing/src/Makefile.ag
testing/src/Mdiff.c
testing/src/Mfilter.py.in
testing/src/MkillUsers.in
testing/src/Mlog.bat
testing/src/Mlog.in
testing/src/Mtest.py.bat
testing/src/Mtest.py.in
testing/src/Mtimeout.c
testing/src/__init__.py
testing/src/cmptests.py
testing/src/difflib.c
testing/src/difflib.h
testing/src/helpers.c
testing/src/helpers.h
testing/src/monet_options.py.in
testing/src/process.py
testing/src/quicktest
testing/src/subprocess26.py
testing/src/testing_getopt.c
testing/src/trace.py
testing/subprocess26.py
testing/testing_getopt.c
testing/trace.py
Branch: default
Log Message:
removed obsolete "src" subdirectory (also) in "testing"
diffs (truncated from 834 to 300 lines):
diff --git a/NT/wincompile.py b/NT/wincompile.py
--- a/NT/wincompile.py
+++ b/NT/wincompile.py
@@ -19,7 +19,7 @@
verbose = False
# the splitcommand function is a straight copy of the same function in
-# ../../testing/src/process.py.
+# ../../testing/process.py.
def splitcommand(cmd):
'''Like string.split, except take quotes into account.'''
q = None
diff --git a/buildtools/conf/MonetDB.m4 b/buildtools/conf/MonetDB.m4
--- a/buildtools/conf/MonetDB.m4
+++ b/buildtools/conf/MonetDB.m4
@@ -544,7 +544,7 @@
case "$host_os" in
linux*)
AC_MSG_CHECKING(which Linux distribution we're using)
- dnl Please keep this aligned / in sync with TestTools/.Mconfig.rc &
TestTools/MdoServer & testing/src/Mtest.py.in !
+ dnl Please keep this aligned / in sync with TestTools/.Mconfig.rc &
TestTools/MdoServer & testing/Mtest.py.in !
if test -s /etc/fedora-release ; then
LINUX_DIST="`cat /etc/fedora-release | head -n1 \
| sed 's|^.*\(Fedora\).* release \([[0-9]][[^ \n]]*\)\(
.*\)*$|\1:\2|'`"
diff --git a/clients/RunMapprove.bat.in b/clients/RunMapprove.bat.in
--- a/clients/RunMapprove.bat.in
+++ b/clients/RunMapprove.bat.in
@@ -13,12 +13,12 @@
set builddir=%buildbase%\clients
set srcdir=@XSOURCE@\clients
-set PYTHONPATH=%buildbase%\testing\src;%srcdir%\..\testing\src;%PYTHONPATH%
+set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
REM execute Mapprove.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\src\Mapprove.py" --package=%pkg%
"--TSTTRGBASE=%builddir%" %*
+call "%buildbase%\testing\Mapprove.py" --package=%pkg%
"--TSTTRGBASE=%builddir%" %*
popd
endlocal
diff --git a/clients/RunMapprove.in b/clients/RunMapprove.in
--- a/clients/RunMapprove.in
+++ b/clients/RunMapprove.in
@@ -23,7 +23,7 @@
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
-PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
# execute Mapprove.py in the source directory
@@ -32,4 +32,4 @@
# execute the script.
# if no arguments, do a recursive approve (Mapprove.py -r), else pass
# on the arguments
-exec python "${buildbase}/testing/src/Mapprove.py" --package=${pkg}
--TSTTRGBASE="${builddir}" "${@--r}"
+exec python "${buildbase}/testing/Mapprove.py" --package=${pkg}
--TSTTRGBASE="${builddir}" "${@--r}"
diff --git a/clients/RunMtest.bat.in b/clients/RunMtest.bat.in
--- a/clients/RunMtest.bat.in
+++ b/clients/RunMtest.bat.in
@@ -13,18 +13,18 @@
set builddir=%buildbase%\clients
set srcdir=@XSOURCE@\clients
-set PATH=%buildbase%\testing\src;%PATH%
+set PATH=%buildbase%\testing;%PATH%
set PATH=%builddir%\mapiclient;%PATH%
set PATH=%builddir%\mapilib;%PATH%
set PATH=%builddir%\python;%PATH%
-set
PYTHONPATH=%srcdir%\python;%buildbase%\testing\src;%srcdir%\..\testing\src;%PYTHONPATH%
+set
PYTHONPATH=%srcdir%\python;%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
REM execute Mtest.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\src\Mtest.py" --package=%pkg%
"--dbfarm=%builddir%\dbfarm" "--TSTTRGBASE=%builddir%" %*
+call "%buildbase%\testing\Mtest.py" --package=%pkg%
"--dbfarm=%builddir%\dbfarm" "--TSTTRGBASE=%builddir%" %*
popd
endlocal
diff --git a/clients/RunMtest.in b/clients/RunMtest.in
--- a/clients/RunMtest.in
+++ b/clients/RunMtest.in
@@ -33,10 +33,10 @@
done
# enhance various paths to find our stuff
-PATH="${builddir}/mapiclient:${builddir}/python:${buildbase}/testing/src:$PATH"
+PATH="${builddir}/mapiclient:${builddir}/python:${buildbase}/testing:$PATH"
export PATH
-PYTHONPATH="${srcdir}/python:${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
+PYTHONPATH="${srcdir}/python:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
# execute Mtest.py in the source directory
@@ -47,4 +47,4 @@
# 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/src/Mtest.py" --package=${pkg}
--dbfarm="${builddir}/dbfarm" --TSTTRGBASE="${builddir}" ${MTEST_AT+--at}
"${@--rq}"
+exec python "${buildbase}/testing/Mtest.py" --package=${pkg}
--dbfarm="${builddir}/dbfarm" --TSTTRGBASE="${builddir}" ${MTEST_AT+--at}
"${@--rq}"
diff --git a/geom/RunMapprove.bat.in b/geom/RunMapprove.bat.in
--- a/geom/RunMapprove.bat.in
+++ b/geom/RunMapprove.bat.in
@@ -18,12 +18,12 @@
set builddir=%buildbase%\geom
set srcdir=@XSOURCE@\geom
-set PYTHONPATH=%buildbase%\testing\src;%srcdir%\..\testing\src;%PYTHONPATH%
+set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
REM execute Mapprove.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\src\Mapprove.py" -%V% "--package=%pkg%"
"--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+call "%buildbase%\testing\Mapprove.py" -%V% "--package=%pkg%"
"--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5 %6 %7 %8 %9
popd
endlocal
diff --git a/geom/RunMapprove.in b/geom/RunMapprove.in
--- a/geom/RunMapprove.in
+++ b/geom/RunMapprove.in
@@ -33,7 +33,7 @@
esac
done
-PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
# execute Mapprove.py in the source directory
@@ -42,4 +42,4 @@
# execute the script.
# if no arguments, do a recursive approve (Mapprove.py -r), else pass
# on the arguments
-exec python "${buildbase}/testing/src/Mapprove.py" -$V --package=${pkg}
--TSTTRGBASE="${builddir}" "${@--r}"
+exec python "${buildbase}/testing/Mapprove.py" -$V --package=${pkg}
--TSTTRGBASE="${builddir}" "${@--r}"
diff --git a/geom/RunMtest.bat.in b/geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in
+++ b/geom/RunMtest.bat.in
@@ -76,19 +76,19 @@
copy /y %srcdir%\..\monetdb5\modules\atoms\??_*.mal
%buildbase%\monetdb5\modules\atoms\autoload
:skip_5
-set PATH=%buildbase%\monetdb%V%\tools;%buildbase%\testing\src;%PATH%
+set PATH=%buildbase%\monetdb%V%\tools;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
rem to find geos_c.dll
set PATH=%GEOS%\bin;%PATH%
-set PYTHONPATH=%buildbase%\testing\src;%srcdir%\..\testing\src;%PYTHONPATH%
+set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
REM execute Mtest.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\src\Mtest.py" -%V% "--package=%pkg%"
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm"
"--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+call "%buildbase%\testing\Mtest.py" -%V% "--package=%pkg%"
"--monet_mod_path=%MOD_PATH%" "--dbfarm=%builddir%\dbfarm"
"--TSTTRGBASE=%builddir%" %1 %2 %3 %4 %5 %6 %7 %8 %9
popd
endlocal
diff --git a/geom/RunMtest.in b/geom/RunMtest.in
--- a/geom/RunMtest.in
+++ b/geom/RunMtest.in
@@ -77,10 +77,10 @@
# enhance various paths to find our stuff
libpath="${MOD_PATH}"
-PATH="${buildbase}/monetdb$V/tools:${buildbase}/testing/src:$PATH"
+PATH="${buildbase}/monetdb$V/tools:${buildbase}/testing:$PATH"
export PATH
-PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
if [ "${LD_LIBRARY_PATH}" ] ; then
@@ -112,4 +112,4 @@
# 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/src/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" -$V --package=${pkg}
--monet_mod_path="${MOD_PATH}" --dbfarm="${builddir}/dbfarm"
--TSTTRGBASE="${builddir}" ${MTEST_AT+--at} "${@--rq}"
diff --git a/java/RunMapprove.bat.in b/java/RunMapprove.bat.in
--- a/java/RunMapprove.bat.in
+++ b/java/RunMapprove.bat.in
@@ -13,12 +13,12 @@
set builddir=%buildbase%\java
set srcdir=@XSOURCE@\java
-set PYTHONPATH=%buildbase%\testing\src;%srcdir%\..\testing\src;%PYTHONPATH%
+set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
REM execute Mapprove.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\src\Mapprove.py" --package=%pkg%
"--TSTTRGBASE=%builddir%" %*
+call "%buildbase%\testing\Mapprove.py" --package=%pkg%
"--TSTTRGBASE=%builddir%" %*
popd
endlocal
diff --git a/java/RunMapprove.in b/java/RunMapprove.in
--- a/java/RunMapprove.in
+++ b/java/RunMapprove.in
@@ -23,7 +23,7 @@
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
-PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
# execute Mapprove.py in the source directory
@@ -32,4 +32,4 @@
# execute the script.
# if no arguments, do a recursive approve (Mapprove.py -r), else pass
# on the arguments
-exec python "${buildbase}/testing/src/Mapprove.py" --package=${pkg}
--TSTTRGBASE="${builddir}" "${@--r}"
+exec python "${buildbase}/testing/Mapprove.py" --package=${pkg}
--TSTTRGBASE="${builddir}" "${@--r}"
diff --git a/java/RunMtest.bat.in b/java/RunMtest.bat.in
--- a/java/RunMtest.bat.in
+++ b/java/RunMtest.bat.in
@@ -13,14 +13,14 @@
set builddir=%buildbase%\java
set srcdir=@XSOURCE@\java
-set PATH=%buildbase%\testing\src;%PATH%
+set PATH=%buildbase%\testing;%PATH%
-set PYTHONPATH=%buildbase%\testing\src;%srcdir%\..\testing\src;%PYTHONPATH%
+set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
REM execute Mtest.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\src\Mtest.py" --package=%pkg%
"--dbfarm=%builddir%\dbfarm" "--TSTTRGBASE=%builddir%" %*
+call "%buildbase%\testing\Mtest.py" --package=%pkg%
"--dbfarm=%builddir%\dbfarm" "--TSTTRGBASE=%builddir%" %*
popd
endlocal
diff --git a/java/RunMtest.in b/java/RunMtest.in
--- a/java/RunMtest.in
+++ b/java/RunMtest.in
@@ -25,10 +25,10 @@
uname=`uname`
# enhance various paths to find our stuff
-PATH="${buildbase}/testing/src:$PATH"
+PATH="${buildbase}/testing:$PATH"
export PATH
-PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
# execute Mtest.py in the source directory
@@ -39,4 +39,4 @@
# 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/src/Mtest.py" --package=${pkg}
--dbfarm="${builddir}/dbfarm" --TSTTRGBASE="${builddir}" ${MTEST_AT+--at}
"${@--rq}"
+exec python "${buildbase}/testing/Mtest.py" --package=${pkg}
--dbfarm="${builddir}/dbfarm" --TSTTRGBASE="${builddir}" ${MTEST_AT+--at}
"${@--rq}"
diff --git a/monetdb4/RunMapprove.bat.in b/monetdb4/RunMapprove.bat.in
--- a/monetdb4/RunMapprove.bat.in
+++ b/monetdb4/RunMapprove.bat.in
@@ -13,12 +13,12 @@
set builddir=%buildbase%\monetdb4
set srcdir=@XSOURCE@\monetdb4
-set PYTHONPATH=%buildbase%\testing\src;%srcdir%\..\testing\src;%PYTHONPATH%
+set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
REM execute Mapprove.py in the source directory
pushd %srcdir%
-call "%buildbase%\testing\src\Mapprove.py"
"--config=%builddir%\conf\MonetDB.conf" --package=%pkg%
"--TSTTRGBASE=%builddir%" %*
+call "%buildbase%\testing\Mapprove.py" "--config=%builddir%\conf\MonetDB.conf"
--package=%pkg% "--TSTTRGBASE=%builddir%" %*
popd
endlocal
diff --git a/monetdb4/RunMapprove.in b/monetdb4/RunMapprove.in
--- a/monetdb4/RunMapprove.in
+++ b/monetdb4/RunMapprove.in
@@ -23,7 +23,7 @@
# make sure srcdir contains absolute path name
srcdir=`cd '@srcdir@'; pwd`
-PYTHONPATH="${buildbase}/testing/src:${srcdir}/../testing/src:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
# execute Mapprove.py in the source directory
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
