Changeset: e25eaba3fd91 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e25eaba3fd91
Modified Files:
java/RunMapprove.bat.in
java/RunMapprove.in
java/RunMtest.bat.in
java/RunMtest.in
Branch: default
Log Message:
Merge with default
diffs (truncated from 314 to 300 lines):
diff --git a/geom/RunMtest.bat.in b/geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in
+++ b/geom/RunMtest.bat.in
@@ -20,13 +20,13 @@
set MOD_PATH=%builddir%\monetdb%V%\.libs
set MOD_PATH=%MOD_PATH%;%builddir%\monetdb%V%
-set MOD_PATH=%MOD_PATH%;%builddir%\sql
REM enable auto-loading of modules before `make install`
if not exist %builddir%\monetdb%V%\autoload mkdir
%builddir%\monetdb%V%\autoload
copy /y %srcdir%\monetdb%V%\??_*.mal %builddir%\monetdb%V%\autoload
REM enable auto-loading of SQL createdb scripts before `make install`
+set MOD_PATH=%MOD_PATH%;%builddir%\sql
if not exist %builddir%\sql\createdb mkdir %builddir%\sql\createdb
copy /y %srcdir%\sql\??_*.sql %builddir%\sql\createdb
diff --git a/geom/RunMtest.in b/geom/RunMtest.in
--- a/geom/RunMtest.in
+++ b/geom/RunMtest.in
@@ -37,13 +37,14 @@
# 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
done
# enable auto-loading of SQL createdb scripts before `make install`
+MOD_PATH="${MOD_PATH}:${builddir}/sql"
mkdir -p ${builddir}/sql/createdb
cp -f ${srcdir}/sql/[0-9][0-9]_*.sql ${builddir}/sql/createdb/ 2>/dev/null
@@ -52,7 +53,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
@@ -63,7 +64,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
@@ -74,6 +75,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/java/Makefile.ag b/java/Makefile.ag
--- a/java/Makefile.ag
+++ b/java/Makefile.ag
@@ -17,9 +17,7 @@
SUBDIRS = HAVE_JAVAJDBC?tests
-EXTRA_DIST = RunMtest.in RunMtest.bat.in \
- RunMapprove.in \
- build.xml build.properties release.txt
+EXTRA_DIST = build.xml build.properties release.txt
EXTRA_DIST_DIR = src \
example
@@ -42,8 +40,6 @@
FILES = merocontrol.jar
}
-TESTS = RunMtest
-TESTS_ENVIRONMENT = $(SHELL)
JAVA_HOME = @JAVA_HOME@
# vim: ft=automake :
diff --git a/java/RunMapprove.bat.in b/java/RunMapprove.bat.in
deleted file mode 100644
--- a/java/RunMapprove.bat.in
+++ /dev/null
@@ -1,26 +0,0 @@
-@echo off
-
-if not "%1"=="" goto skip
-call %0 -r
-goto end
-
-:skip
-
-setlocal
-
-set pkg=java
-set buildbase=@XBUILD@
-set builddir=%buildbase%\java
-set srcdir=@XSOURCE@\java
-
-set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
-
-REM execute Mapprove.py in the source directory
-pushd %srcdir%
-
-call "%buildbase%\testing\Mapprove.py" --package=%pkg%
"--TSTTRGBASE=%builddir%" %*
-
-popd
-endlocal
-
-:end
diff --git a/java/RunMapprove.in b/java/RunMapprove.in
deleted file mode 100755
--- a/java/RunMapprove.in
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-# The contents of this file are subject to the MonetDB Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-#
-# The Original Code is the MonetDB Database System.
-#
-# The Initial Developer of the Original Code is CWI.
-# Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-# Copyright August 2008-2011 MonetDB B.V.
-# All Rights Reserved.
-
-pkg=java
-buildbase=@QBUILD@
-builddir="${buildbase}/java"
-# make sure srcdir contains absolute path name
-srcdir=`cd '@srcdir@'; pwd`
-
-PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
-export PYTHONPATH
-
-# execute Mapprove.py in the source directory
-cd "$srcdir"
-
-# execute the script.
-# if no arguments, do a recursive approve (Mapprove.py -r), else pass
-# on the arguments
-exec python "${buildbase}/testing/Mapprove.py" --package=${pkg}
--TSTTRGBASE="${builddir}" "${@--r}"
diff --git a/java/RunMtest.bat.in b/java/RunMtest.bat.in
deleted file mode 100644
--- a/java/RunMtest.bat.in
+++ /dev/null
@@ -1,28 +0,0 @@
-@echo off
-
-if not "%1"=="" goto skip
-call %0 -rq
-goto end
-
-:skip
-
-setlocal
-
-set pkg=java
-set buildbase=@XBUILD@
-set builddir=%buildbase%\java
-set srcdir=@XSOURCE@\java
-
-set PATH=%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
-
-set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
-
-REM execute Mtest.py in the source directory
-pushd %srcdir%
-
-call "%buildbase%\testing\Mtest.py" --package=%pkg%
"--dbfarm=%builddir%\dbfarm" "--TSTTRGBASE=%builddir%" %*
-
-popd
-endlocal
-
-:end
diff --git a/java/RunMtest.in b/java/RunMtest.in
deleted file mode 100755
--- a/java/RunMtest.in
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-# The contents of this file are subject to the MonetDB Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-#
-# The Original Code is the MonetDB Database System.
-#
-# The Initial Developer of the Original Code is CWI.
-# Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-# Copyright August 2008-2011 MonetDB B.V.
-# All Rights Reserved.
-
-pkg=java
-buildbase=@QBUILD@
-builddir="${buildbase}/java"
-# make sure srcdir contains absolute path name
-srcdir=`cd '@srcdir@'; pwd`
-uname=`uname`
-
-# enhance various paths to find our stuff
-PATH="${buildbase}/clients/mapiclient:${buildbase}/testing:$PATH"
-export PATH
-
-PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
-export PYTHONPATH
-
-# execute Mtest.py in the source directory
-cd "$srcdir"
-
-# execute the script.
-# if no arguments, do a recursive test (Mtest.py -r), else pass on the
-# 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/Mtest.py" --package=${pkg}
--dbfarm="${builddir}/dbfarm" --TSTTRGBASE="${builddir}" ${MTEST_AT+--at}
"${@--rq}"
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/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
@@ -37,7 +37,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
@@ -45,7 +45,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
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
