Changeset: bea3b5d6962e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bea3b5d6962e
Modified Files:
configure.ag
monetdb5/mal/Tests/recycle12.mal
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/mal_init.mal
Branch: headless
Log Message:
Merge with default branch.
diffs (truncated from 1867 to 300 lines):
diff --git a/clients/RunMtest.bat.in b/clients/RunMtest.bat.in
--- a/clients/RunMtest.bat.in
+++ b/clients/RunMtest.bat.in
@@ -15,10 +15,17 @@
set PATH=%buildbase%\testing;%PATH%
+set PATH=%builddir%\examples\C;%PATH%
set PATH=%builddir%\mapiclient;%PATH%
set PATH=%builddir%\mapilib;%PATH%
-set
PYTHONPATH=%srcdir%\python;%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set
PYTHONPATH=%builddir%\python\build\lib;%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+
+set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
+
+set perlib=%builddir%\perl;%srcdir%\perl
+set PERLLIB=%perlib%;%PERLLIB%
+set PERL5LIB=%perlib%;%PERL5LIB%
REM execute Mtest.py in the source directory
pushd %srcdir%
diff --git a/clients/RunMtest.in b/clients/RunMtest.in
--- a/clients/RunMtest.in
+++ b/clients/RunMtest.in
@@ -33,12 +33,20 @@
done
# enhance various paths to find our stuff
-PATH="${builddir}/mapiclient:${buildbase}/testing:$PATH"
+PATH="${builddir}/mapiclient:${builddir}/examples/C:${builddir}/perl/Tests:${buildbase}/testing:$PATH"
export PATH
-PYTHONPATH="${srcdir}/python:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
+PYTHONPATH="${builddir}/python/build/lib:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
+CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
+export CLASSPATH
+
+perlib="${builddir}/perl:${srcdir}/perl"
+PERLLIB="${perlib}:${PERLLIB}"
+PERL5LIB="${perlib}:${PERL5LIB}"
+export PERLLIB PERL5LIB
+
# execute Mtest.py in the source directory
cd "$srcdir"
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -41,6 +41,13 @@
AM_CONDITIONAL(NOT_WIN32, test x"$target_os" != xcygwin)
AM_CONDITIONAL(NATIVE_WIN32, false)
+m4_ifndef([PKG_PROG_PKG_CONFIG],
+ [m4_fatal([Could not locate the pkg-config autoconf
+ macros. These are usually located in /usr/share/aclocal/pkg.m4.
+ If your macros are in a different location, try setting the
+ environment variable M4DIRS="-I/other/macro/dir" before running
+ ./bootstrap or autoreconf again.])])
+
PKG_PROG_PKG_CONFIG
dnl VERSION_TO_NUMBER macro (copied from libxslt)
@@ -954,8 +961,9 @@
else
origCFLAGS="$CFLAGS"
dnl remove "-g" as some compilers don't like "-g -Ox" combinations
+ dnl remove "-O2" as we add "-Ox" and some compilers don't like "-Oy -Ox"
combinations
CFLAGS=" $CFLAGS "
- CFLAGS="`echo "$CFLAGS" | sed -e 's| -g | |g' -e 's|^ ||' -e 's| $||'`"
+ CFLAGS="`echo "$CFLAGS" | sed -e 's| -g | |g' -e 's| -O2 | |g' -e 's|^ ||'
-e 's| $||'`"
JAVACFLAGS=" $JAVACFLAGS "
JAVACFLAGS="`echo "$JAVACFLAGS" | sed -e 's| -g | |g' -e 's| -g:[[a-z]]* |
|g' -e 's|^ ||' -e 's| $||'`"
dnl Optimization flags
@@ -990,7 +998,7 @@
esac
;;
x86_64-*-*|i*86-*-*)
- CFLAGS="$CFLAGS -O6 -fomie-frame-pointer
-finline-functions -malign-loops=4 -malign-jumps=4 -malign-functions=4
-fexpensive-optimizations -funroll-all-loops -funroll-loops
-frerun-cse-after-loop -frerun-loop-opt"
+ CFLAGS="$CFLAGS -O6 -fomit-frame-pointer
-finline-functions -malign-loops=4 -malign-jumps=4 -malign-functions=4
-fexpensive-optimizations -funroll-all-loops -funroll-loops
-frerun-cse-after-loop -frerun-loop-opt"
case "$gcc_ver" in
4.*) CFLAGS="$CFLAGS -ftree-vectorize";;
dnl "-ftree-vectorize" is only available with
newer versions of gcc, only;
@@ -2086,6 +2094,14 @@
AC_SUBST(READLINE_LIBS)
AC_SUBST(READLINE_INCS)
+m4_ifndef([AM_ICONV],
+ [m4_fatal([Could not locate the iconv autoconf
+ macros. These are usually located in /usr/share/aclocal/iconv.m4 and
+ provided by the gettext package. If your macros are in a different
+ location, try setting the environment variable
+ M4DIRS="-I/other/macro/dir" before running ./bootstrap or autoreconf
+ again.])])
+
AM_ICONV
dnl UUID: remember that most UNIX systems have uuid_* functions in their
diff --git a/geom/RunMtest.bat.in b/geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in
+++ b/geom/RunMtest.bat.in
@@ -73,14 +73,20 @@
set PATH=%buildbase%\tools\mserver;%PATH%
:skip_5
-set PATH=%buildbase%\clients\mapiclient;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\clients\perl\Tests;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
rem to find geos_c.dll
set PATH=%GEOS%\bin;%PATH%
-set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set
PYTHONPATH=%buildbase%\clients\python\build\lib;%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+
+set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
+
+set perlib=%buildbase%\clients\perl;%srcdir%\..\clients\perl
+set PERLLIB=%perlib%;%PERLLIB%
+set PERL5LIB=%perlib%;%PERL5LIB%
REM execute Mtest.py in the source directory
pushd %srcdir%
diff --git a/geom/RunMtest.in b/geom/RunMtest.in
--- a/geom/RunMtest.in
+++ b/geom/RunMtest.in
@@ -76,12 +76,20 @@
# 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}/clients/perl/Tests:${buildbase}/testing:$PATH"
export PATH
-PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/clients/python/build/lib:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
+CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
+export CLASSPATH
+
+perlib="${buildbase}/clients/perl:${srcdir}/../clients/perl"
+PERLLIB="${perlib}:${PERLLIB}"
+PERL5LIB="${perlib}:${PERL5LIB}"
+export PERLLIB PERL5LIB
+
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
fi
diff --git a/monetdb5/RunMtest.bat.in b/monetdb5/RunMtest.bat.in
--- a/monetdb5/RunMtest.bat.in
+++ b/monetdb5/RunMtest.bat.in
@@ -36,13 +36,19 @@
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%\clients\perl\Tests;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\mal;%PATH%
set PATH=%buildbase%\tools\mserver;%PATH%
-set PYTHONPATH=%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+set
PYTHONPATH=%buildbase%\clients\python\build\lib;%buildbase%\testing;%srcdir%\..\testing;%PYTHONPATH%
+
+set CLASSPATH=%buildbase%\java;%buildbase%\java\tests;%CLASSPATH%
+
+set perlib=%buildbase%\clients\perl;%srcdir%\..\clients\perl
+set PERLLIB=%perlib%;%PERLLIB%
+set PERL5LIB=%perlib%;%PERL5LIB%
REM execute Mtest.py in the source directory
pushd %srcdir%
diff --git a/monetdb5/RunMtest.in b/monetdb5/RunMtest.in
--- a/monetdb5/RunMtest.in
+++ b/monetdb5/RunMtest.in
@@ -35,15 +35,23 @@
# 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}/clients/perl/Tests:${buildbase}/testing"
libpath="${MOD_PATH}:${builddir}/mal/.libs"
PATH="${binpath}:$PATH"
export PATH
-PYTHONPATH="${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
+PYTHONPATH="${buildbase}/clients/python/build/lib:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
export PYTHONPATH
+CLASSPATH="${buildbase}/java:${buildbase}/java/tests:${CLASSPATH}"
+export CLASSPATH
+
+perlib="${buildbase}/clients/perl:${srcdir}/../clients/perl"
+PERLLIB="${perlib}:${PERLLIB}"
+PERL5LIB="${perlib}:${PERL5LIB}"
+export PERLLIB PERL5LIB
+
if [ "${LD_LIBRARY_PATH}" ] ; then
LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
fi
diff --git a/monetdb5/mal/Tests/recycle12.mal b/monetdb5/mal/Tests/recycle12.mal
--- a/monetdb5/mal/Tests/recycle12.mal
+++ b/monetdb5/mal/Tests/recycle12.mal
@@ -43,6 +43,6 @@
qry1(10);
qry1(10);
-recycle.dumpQPat();
+recycle.dump();
#recycle.dump();
diff --git a/monetdb5/mal/Tests/recycle12.stable.out
b/monetdb5/mal/Tests/recycle12.stable.out
--- a/monetdb5/mal/Tests/recycle12.stable.out
+++ b/monetdb5/mal/Tests/recycle12.stable.out
@@ -83,7 +83,7 @@
#qry1(10);
#qry1(10);
#
-#recycle.dumpQPat();
+#recycle.dump();
##recycle.dump();
#
#
@@ -98,7 +98,7 @@
user.qry(2,8);
user.qry1(10);
user.qry1(10);
- recycle.dumpQPat();
+ recycle.dump();
#recycle.dump();
end main;
#Query patterns 2
diff --git a/monetdb5/modules/atoms/Tests/xml00.stable.err
b/monetdb5/modules/atoms/Tests/xml00.stable.err
--- a/monetdb5/modules/atoms/Tests/xml00.stable.err
+++ b/monetdb5/modules/atoms/Tests/xml00.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'xml00` in directory 'modules/mal` itself:
+stderr of test 'xml00` in directory 'modules/atoms` itself:
# 22:46:59 >
diff --git a/monetdb5/modules/atoms/Tests/xml00.stable.out
b/monetdb5/modules/atoms/Tests/xml00.stable.out
--- a/monetdb5/modules/atoms/Tests/xml00.stable.out
+++ b/monetdb5/modules/atoms/Tests/xml00.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'xml00` in directory 'modules/mal` itself:
+stdout of test 'xml00` in directory 'modules/atoms` itself:
# 22:46:59 >
diff --git a/monetdb5/modules/atoms/Tests/xml01.stable.err
b/monetdb5/modules/atoms/Tests/xml01.stable.err
--- a/monetdb5/modules/atoms/Tests/xml01.stable.err
+++ b/monetdb5/modules/atoms/Tests/xml01.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'xml01` in directory 'modules/mal` itself:
+stderr of test 'xml01` in directory 'modules/atoms` itself:
# 22:46:59 >
diff --git a/monetdb5/modules/atoms/Tests/xml01.stable.out
b/monetdb5/modules/atoms/Tests/xml01.stable.out
--- a/monetdb5/modules/atoms/Tests/xml01.stable.out
+++ b/monetdb5/modules/atoms/Tests/xml01.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'xml01` in directory 'modules/mal` itself:
+stdout of test 'xml01` in directory 'modules/atoms` itself:
# 22:46:59 >
diff --git a/monetdb5/modules/atoms/Tests/xml02.stable.err
b/monetdb5/modules/atoms/Tests/xml02.stable.err
--- a/monetdb5/modules/atoms/Tests/xml02.stable.err
+++ b/monetdb5/modules/atoms/Tests/xml02.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'xml02` in directory 'modules/mal` itself:
+stderr of test 'xml02` in directory 'modules/atoms` itself:
# 22:46:59 >
diff --git a/monetdb5/modules/atoms/Tests/xml02.stable.out
b/monetdb5/modules/atoms/Tests/xml02.stable.out
--- a/monetdb5/modules/atoms/Tests/xml02.stable.out
+++ b/monetdb5/modules/atoms/Tests/xml02.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'xml02` in directory 'modules/mal` itself:
+stdout of test 'xml02` in directory 'modules/atoms` itself:
# 22:46:59 >
diff --git a/monetdb5/modules/atoms/Tests/xml03.stable.err
b/monetdb5/modules/atoms/Tests/xml03.stable.err
--- a/monetdb5/modules/atoms/Tests/xml03.stable.err
+++ b/monetdb5/modules/atoms/Tests/xml03.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'xml03` in directory 'modules/mal` itself:
+stderr of test 'xml03` in directory 'modules/atoms` itself:
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
