This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository pgrouting.
commit c3f4eff2c8110814c1d1b8f63e94ef44b87e0847 Author: Bas Couwenberg <[email protected]> Date: Tue Mar 20 17:06:45 2018 +0100 New upstream version 2.5.3 --- .travis.yml | 3 +- CMakeLists.txt | 11 +- NEWS | 12 +- README.md | 4 +- VERSION | 2 +- appveyor.yml | 2 +- ci/appveyor/install.bat | 36 ++++-- ci/appveyor/vercompare.bat | 50 +++++++++ ci/bessie/regress.sh | 32 ++++++ ci/bessie32/regress.sh | 32 ++++++ ci/debbie/regress.sh | 87 +++++++++++++++ doc/src/release_notes.rst | 14 ++- include/c_common/postgres_connection.h | 4 + sql/sigs/pgrouting--2.5.3.sig | 185 +++++++++++++++++++++++++++++++ src/alpha_shape/src/alpha.c | 8 +- src/common/src/coordinates_input.c | 8 +- src/common/src/edges_input.c | 32 +++--- src/common/src/matrixRows_input.c | 8 +- src/common/src/orders_input.c | 8 +- src/common/src/points_input.c | 8 +- src/common/src/restrict_input.c | 8 +- src/common/src/restrictions_input.c | 8 +- src/common/src/vehicles_input.c | 8 +- src/common/test/doc-pgr_version.result | 2 +- src/trsp/src/trsp.c | 16 +-- tools/release-scripts/check-release.sh | 1 + tools/release-scripts/compile-release.sh | 6 +- tools/testers/algorithm-tester.pl | 20 ++-- tools/testers/pg_prove_tests.sh | 24 ++-- 29 files changed, 540 insertions(+), 99 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1898da6..9228691 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ #choose trusty -group: edge dist: trusty sudo: required @@ -74,7 +73,7 @@ before_script: script: - ./tools/travis/pgrouting_build.sh $POSTGRESQL_VERSION $POSTGIS_VERSION # tests as part of script so if a test fails the build fails - - ./tools/testers/pg_prove_tests.sh $PG_USER DEBUG + - ./tools/testers/pg_prove_tests.sh $PG_USER 5432 DEBUG #after_script: - ./tools/travis/pgrouting_test.sh $POSTGRESQL_VERSION $PG_USER -ignorenotice diff --git a/CMakeLists.txt b/CMakeLists.txt index 857ae30..5d1a9f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,10 +70,10 @@ configure_file("configuration.conf" "configuration.conf") file(STRINGS configuration.conf PgRouting_CONFIGURATION_FILE) set(PgRouting_SOURCE_NAMES "") -set(PgRouting_SQL_DIRECTORIES "") -set(PgRouting_DOC_DIRECTORIES "") +set(PgRouting_SQL_DIRECTORIES "") +set(PgRouting_DOC_DIRECTORIES "") foreach(line ${PgRouting_CONFIGURATION_FILE}) - string(REGEX REPLACE "^(#).*" "\\1" comment ${line}) + string(REGEX REPLACE "^(#).*" "\\1" comment ${line}) if("${comment}" MATCHES "#") continue() endif() @@ -182,7 +182,7 @@ endif() set(PGROUTING_VERSION_MAJOR "2") set(PGROUTING_VERSION_MINOR "5") -set(PGROUTING_VERSION_PATCH "2") +set(PGROUTING_VERSION_PATCH "3") set(PGROUTING_VERSION_DEV "") set(PGROUTING_SHORT_VERSION "${PGROUTING_VERSION_MAJOR}.${PGROUTING_VERSION_MINOR}") @@ -301,7 +301,7 @@ endif() string(SUBSTRING "${POSTGRESQL_VERSION_STRING}" 11 -1 POSTGRESQL_VERSION) # for XbetaY XalphaY XrcY -> X.Y -string(REGEX REPLACE "^([0-9]+)[beta|alpha|rc].*" "\\1.0" POSTGRESQL_VERSION ${POSTGRESQL_VERSION}) +string(REGEX REPLACE "^([0-9]+)[beta|alpha|rc|devel].*" "\\1.0" POSTGRESQL_VERSION ${POSTGRESQL_VERSION}) #for X.Y.Z -> XY Y<10 string(REGEX REPLACE "^([0-9]+)\\.([0-9]+).*" "\\1\\2" PGSQL_VERSION ${POSTGRESQL_VERSION}) @@ -323,6 +323,7 @@ endif(WIN32) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DPGSQL_VERSION=${PGSQL_VERSION}") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DPGSQL_VERSION=${PGSQL_VERSION}") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DPGSQL_VERSION=${PGSQL_VERSION}") +message(STATUS "PGSQL_VERSION=${PGSQL_VERSION}") #--------------------------------------------- diff --git a/NEWS b/NEWS index a89f9b4..13d7c86 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,14 @@ +pgRouting 2.5.3 Release Notes +------------------------------------------------------------------------------- + +To see the issues closed by this release see the [Git closed milestone for 2.5.3 ](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.3%22%20) on Github. + +*Bug fixes* + +* Fix for postgresql 11: Removed a compilation error when compiling with postgreSQL + + pgRouting 2.5.2 Release Notes ------------------------------------------------------------------------------- @@ -6,7 +16,7 @@ To see the issues closed by this release see the [Git closed milestone for 2.5.2 *Bug fixes* -* Fix for postgresql 10.1: Removed a copiler condition +* Fix for postgresql 10.1: Removed a compiler condition diff --git a/README.md b/README.md index f8a8184..8b9dc22 100644 --- a/README.md +++ b/README.md @@ -32,14 +32,14 @@ https://github.com/pgRouting/pgrouting/releases <td>master</td> <td><img src="https://travis-ci.org/pgRouting/pgrouting.png?branch=master"; alt="Build Status"/></td> <td><img src="https://ci.appveyor.com/api/projects/status/github/pgRouting/pgrouting?branch=master&svg=true"; alt="Appveyor Status"/></td> - <td><img src="http://winnie.postgis.net:1500/buildStatus/icon?job=pgRouting_matrix_master"; alt="Jenkins Status"/></td> + <td><img src="https://winnie.postgis.net:444/buildStatus/icon?job=pgRouting_matrix_master"; alt="Jenkins Status"/></td> <td></td> </tr> <tr> <td>develop</td> <td><img src="https://travis-ci.org/pgRouting/pgrouting.png?branch=develop"; alt="Build Status"/></td> <td><img src="https://ci.appveyor.com/api/projects/status/github/pgRouting/pgrouting?branch=develop&svg=true"; alt="Appveyor Status"/></td> - <td><img src="http://winnie.postgis.net:1500/buildStatus/icon?job=pgRouting_matrix_branch_develop"; alt="Jenkins Status"/></td> + <td><img src="https://winnie.postgis.net:444/buildStatus/icon?job=pgRouting_matrix_branch_develop"; alt="Jenkins Status"/></td> <td></td> </tr> <tr> diff --git a/VERSION b/VERSION index c2037b9..ce6657a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6254-60585f1f7 master +6286-9a0d404 master diff --git a/appveyor.yml b/appveyor.yml index 2ccaa69..db2c59f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -54,4 +54,4 @@ test_script: - set PGPORT=5432 - set PATH=%PATH%;%PGHOME%\bin # Execute algorithm test by Cygwin - - C:\cygwin\bin\bash -lc "cd /cygdrive/c/build/pgrouting && tools/testers/algorithm-tester.pl -psql \"/cygdrive/c/Progra~1/PostgreSQL/%PG_VER%/bin/psql\"" + #- C:\cygwin\bin\bash -lc "cd /cygdrive/c/build/pgrouting && tools/testers/algorithm-tester.pl -psql \"/cygdrive/c/Progra~1/PostgreSQL/%PG_VER%/bin/psql\"" diff --git a/ci/appveyor/install.bat b/ci/appveyor/install.bat index d86fbe3..23145d5 100644 --- a/ci/appveyor/install.bat +++ b/ci/appveyor/install.bat @@ -20,7 +20,7 @@ if not defined COMMON_INSTALL_DIR set COMMON_INSTALL_DIR=%BUILD_ROOT_DIR%\local\ :: for cmake its the min version if not defined CMAKE_VERSION set CMAKE_VERSION=3.5.2 -if not defined PGIS_VERSION set PGIS_VERSION=2.3.3 +if not defined PGIS_VERSION set PGIS_VERSION=2.3 if not defined BOOST_VERSION set BOOST_VERSION=1.58.0 if not defined CGAL_VERSION set CGAL_VERSION=4.8.1 set PG_VER_NO_DOT=pg%PG_VER:.=% @@ -61,9 +61,14 @@ for /f "tokens=* delims=" %%a in ('cmake --version') do ( set CURR_CMAKE=%CURR_CMAKE:~14% echo cmake %CURR_CMAKE% found -if "%CURR_CMAKE%" GTR "%CMAKE_VERSION%" ( +CALL ci\appveyor\vercompare.bat "%CURR_CMAKE%" "%CMAKE_VERSION%" + +echo "errorlevel %ERRORLEVEL%" + +if %ERRORLEVEL% EQU 0 ( echo cmake %CMAKE_VERSION% already installed ) else ( + CALL SET echo Downloading cmake %CMAKE_VERSION% pushd %DOWNLOADS_DIR% curl -L -O -S -s https://cmake.org/files/v3.5/cmake-%CMAKE_VERSION%-win32-%platform%.msi @@ -97,13 +102,19 @@ echo ==================================== :: Download and install Postgis :: +set PGIS_WILD_FILE=postgis-%PG_VER_NO_DOT%-binaries-%PGIS_VERSION*%w%arch%gcc%GCC%.zip +set PGIS_FILE=postgis-%PG_VER_NO_DOT%-binaries-%PGIS_VERSION%w%arch%gcc%GCC%.zip + +echo %PGIS_WILD_FILE% +echo %PGIS_FILE% + echo ==================================== POSTGIS -if not exist "C:\Progra~1\PostgreSQL\%PG_VER%\makepostgisdb_using_extensions.bat" ( +if not exist "C:\Progra~1\PostgreSQL\%PG_VER%\%PGIS_WILD_FILE%" ( cd %APPVEYOR_BUILD_FOLDER% if not exist %DOWNLOADS_DIR%\postgis-%PG_VER_NO_DOT%-binaries-%PGIS_VERSION%w%arch%gcc%GCC%.zip ( echo Downloading PostGIS %PGIS_VERSION% pushd %DOWNLOADS_DIR% - curl -L -O -S -s http://winnie.postgis.net/download/windows/%PG_VER_NO_DOT%/buildbot/archive/postgis-%PG_VER_NO_DOT%-binaries-%PGIS_VERSION%w%arch%gcc%GCC%.zip + curl -L -O -S -s http://winnie.postgis.net/download/windows/appveyor/postgis-%PG_VER_NO_DOT%-binaries-%PGIS_VERSION%w%arch%gcc%GCC%.zip popd if not exist %DOWNLOADS_DIR%\postgis-%PG_VER_NO_DOT%-binaries-%PGIS_VERSION%w%arch%gcc%GCC%.zip ( echo something went wrong on PostGIS %PGIS_VERSION% download !!!!!!!!! @@ -114,17 +125,22 @@ if not exist "C:\Progra~1\PostgreSQL\%PG_VER%\makepostgisdb_using_extensions.bat echo Extracting PostGIS %PGIS_VERSION% pushd %DOWNLOADS_DIR% + dir 7z x -o%BUILD_ROOT_DIR%\ postgis-%PG_VER_NO_DOT%-binaries-%PGIS_VERSION%w%arch%gcc%GCC%.zip + dir popd echo **** Installing postGIS %PGIS_VERSION% - xcopy /e /y /q %BUILD_ROOT_DIR%\postgis-%PG_VER_NO_DOT%-binaries-%PGIS_VERSION%w%arch%gcc%GCC% C:\Progra~1\PostgreSQL\%PG_VER% - - if not exist "C:\Progra~1\PostgreSQL\%PG_VER%\makepostgisdb_using_extensions.bat" ( - echo something went wrong on PostGIS %PGIS_VERSION% installation !!!!!!!!! + dir %BUILD_ROOT_DIR%\postgis* + dir C:\Progra~1\PostgreSQL\%PG_VER%\postgis* + xcopy /e /y /q %BUILD_ROOT_DIR%\postgis-%PG_VER_NO_DOT%-binaries-%PGIS_VERSION%*w%arch%gcc%GCC% C:\Progra~1\PostgreSQL\%PG_VER% + dir %BUILD_ROOT_DIR%\postgis* + dir C:\Progra~1\PostgreSQL\%PG_VER%\postgis* + + if not exist "C:\Progra~1\PostgreSQL\%PG_VER%\%PGIS_WILD_FILE%" ( + echo something went wrong on PostGIS %PGIS_VERSION% installation if defined LOCAL_DEBUG dir %DOWNLOADS_DIR% - if defined LOCAL_DEBUG dir C:\Progra~1\PostgreSQL\%PG_VER%\ - Exit \B 1 + if defined LOCAL_DEBUG dir C:\Progra~1\PostgreSQL\%PG_VER%\postgis* ) else ( echo **** PostGIS %PGIS_VERSION% %arch% installed ) diff --git a/ci/appveyor/vercompare.bat b/ci/appveyor/vercompare.bat new file mode 100644 index 0000000..4acd63a --- /dev/null +++ b/ci/appveyor/vercompare.bat @@ -0,0 +1,50 @@ +@echo off + +:: left: the installed version +:: right: the requiered min version + +:: return 0 when installed version < requiered version +:: return 1 when installed version >= requiered version + +SETLOCAL + + +set left=%1 +set right=%2 + +for /f "tokens=1-3 delims=." %%a in (%left%) do ( + set VersionLeftMajor=%%a + set VersionLeftMinor=%%b + set VersionLeftBuild=%%c +) + + +for /f "delims=. tokens=1,2,3" %%a in ("%right%") do ( + set VersionRightMajor=%%a + set VersionRightMinor=%%b + set VersionRightBuild=%%c +) + + +:: examples +:: 3.2.12 > 2.3.1 ===> 1 installed does fulfill requiered +if "%VersionLeftMajor%" GTR "%VersionRight.Major%" ( + EXIT /B 0 +) + +:: 1.2.12 > 3.3.1 ===> 0 installed does not fulfill requiered +if %VersionLeftMajor% LSS %VersionRightMajor% ( + EXIT /B 1 +) + +:: the Major's are equal +:: 3.5.12 >= 3.3.1 ===> 1 installed does fulfill requiered +if %VersionLeftMinor% GEQ %VersionRightMinor% ( + EXIT /B 0 +) + +:: 3.2.12 > 3.3.1 ===> 0 installed does not fulfill requiered regardless of build +EXIT /B 1 + +:exit +exit /b diff --git a/ci/bessie/regress.sh b/ci/bessie/regress.sh new file mode 100644 index 0000000..46b0ab4 --- /dev/null +++ b/ci/bessie/regress.sh @@ -0,0 +1,32 @@ +#!/bin/sh +#-- +# Jenkins variables passed in +#-- +# +# export BRANCH=develop +export PGROUTING_VER=$BRANCH + +#------------------------- +# File used in Jenkins setup +#------------------------- +export PATH=${PATH}:/usr/local::/usr/local/lib::/usr/local/bin +echo $PATH +export PGUSER=postgres +export PGROUTING_VER=$BRANCH + +rm -rf ${WORKSPACE}/build${BRANCH} +mkdir ${WORKSPACE}/build${BRANCH} + +cmake --version + +cd ../build${BRANCH} +cmake ../${BRANCH} + +make +sudo make install +cd ../${BRANCH} +perl tools/testers/algorithm-tester.pl + +psql -c "CREATE DATABASE ___pgr___test___" +sh tools/testers/pg_prove_tests.sh ${PGUSER} +psql -c "DROP DATABASE ___pgr___test___" diff --git a/ci/bessie32/regress.sh b/ci/bessie32/regress.sh new file mode 100644 index 0000000..46b0ab4 --- /dev/null +++ b/ci/bessie32/regress.sh @@ -0,0 +1,32 @@ +#!/bin/sh +#-- +# Jenkins variables passed in +#-- +# +# export BRANCH=develop +export PGROUTING_VER=$BRANCH + +#------------------------- +# File used in Jenkins setup +#------------------------- +export PATH=${PATH}:/usr/local::/usr/local/lib::/usr/local/bin +echo $PATH +export PGUSER=postgres +export PGROUTING_VER=$BRANCH + +rm -rf ${WORKSPACE}/build${BRANCH} +mkdir ${WORKSPACE}/build${BRANCH} + +cmake --version + +cd ../build${BRANCH} +cmake ../${BRANCH} + +make +sudo make install +cd ../${BRANCH} +perl tools/testers/algorithm-tester.pl + +psql -c "CREATE DATABASE ___pgr___test___" +sh tools/testers/pg_prove_tests.sh ${PGUSER} +psql -c "DROP DATABASE ___pgr___test___" diff --git a/ci/debbie/regress.sh b/ci/debbie/regress.sh new file mode 100644 index 0000000..d577590 --- /dev/null +++ b/ci/debbie/regress.sh @@ -0,0 +1,87 @@ +#!/bin/bash +#-- +# Jenkins variables passed in +#-- +# +# export BRANCH=develop +export PGROUTING_VER=$BRANCH +export OS_BUILD=64 +export PG_VER=11 +export PGSQL_VERSION=110 +export PGPORT=5411 +export GEOS_VER=3.7.0dev +export GDAL_VER=2.2 +export PROJECTS=${JENKINS_HOME}/workspace +export PGPATH=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD} +export PGDATA=${PGPATH}/data_${PGPORT} +export PGDATABASE=postgres +export PGUSER=postgres +export LD_LIBRARY_PATH="${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}/lib:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/lib:${PGPATH}/lib" +export PATH="${PATH}:${PGPATH}/bin:${PGPATH}/lib:${PGPATH}/include" +export POSTGIS_VER=2.5.0dev + +#--- +# start the pg sever +# -- +export PGLOCALEDIR=${PGPATH}/share/locale + +DAEMON=${PGPATH}/bin/postmaster +PGSTARTLOG=${PGDATA}/start_log.log + + +#initialize the database +${PGPATH}/bin/initdb -U postgres -D ${PGDATA} -A trust + +# check to see if pg is already running +state=`${PGPATH}/bin/pg_ctl status -D ${PGDATA} -l ${PGDATA}/logfile | grep "server is running" ` + +# start pg if not running +if [ "0" == "0$state" ]; then + ${PGPATH}/bin/pg_ctl start -D ${PGDATA} -l ${PGDATA}/logfile >> ${PGSTARTLOG} 2>&1 +fi +echo "ok" + +#-- +# end start pg server +# + +#------------------------- +# File used in Jenkins setup +#------------------------- + +echo $PATH +export PGUSER=postgres +export PGROUTING_VER=$BRANCH + +rm -rf ${WORKSPACE}/build${BRANCH} +mkdir ${WORKSPACE}/build${BRANCH} + +cmake --version + +cd ../build${BRANCH} +cmake ../${BRANCH} + +make +make install +cd ../${BRANCH} +export PERL5LIB=$(echo pwd) +perl tools/testers/algorithm-tester.pl -pgisver "${POSTGIS_VER}" -pgport "${PGPORT}" + +#pgTap tests disable for now until we have installed +if false; then +psql -c "CREATE DATABASE ___pgr___test___" +sh tools/testers/pg_prove_tests.sh ${PGUSER} +psql -c "DROP DATABASE ___pgr___test___" +fi + +#stop the postgres server +state=`${PGPATH}/bin/pg_ctl status -D ${PGDATA} -l ${PGPATH}/data/logfile | grep "server is running"` +echo $state + +if [ "0" != "0$state" ]; then + ${PGPATH}/bin/pg_ctl stop -D ${PGDATA} -l logfile -m fast + rm -rf ${PGDATA} +fi +echo "done" + + diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst index fee1dfc..24bc012 100644 --- a/doc/src/release_notes.rst +++ b/doc/src/release_notes.rst @@ -18,6 +18,7 @@ To see the full list of changes check the list of `Git commits <https://github.c .. changelog start +* :ref:`changelog_2_5_3` * :ref:`changelog_2_5_2` * :ref:`changelog_2_5_1` * :ref:`changelog_2_5_0` @@ -39,6 +40,17 @@ To see the full list of changes check the list of `Git commits <https://github.c .. changelog end +.. _changelog_2_5_3: + +pgRouting 2.5.3 Release Notes +------------------------------------------------------------------------------- + +To see the issues closed by this release see the `Git closed milestone for 2.5.3 <https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%202.5.3%22%20>`_ on Github. + +.. rubric:: Bug fixes + +* Fix for postgresql 11: Removed a compilation error when compiling with postgreSQL + .. _changelog_2_5_2: pgRouting 2.5.2 Release Notes @@ -48,7 +60,7 @@ To see the issues closed by this release see the `Git closed milestone for 2.5.2 .. rubric:: Bug fixes -* Fix for postgresql 10.1: Removed a copiler condition +* Fix for postgresql 10.1: Removed a compiler condition .. _changelog_2_5_1: diff --git a/include/c_common/postgres_connection.h b/include/c_common/postgres_connection.h index 163cf3a..dae6484 100644 --- a/include/c_common/postgres_connection.h +++ b/include/c_common/postgres_connection.h @@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #endif #ifdef __clang__ +#pragma clang diagnostic push #pragma clang diagnostic ignored "-pedantic" #endif @@ -45,7 +46,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #endif #ifdef __clang__ +#pragma clang diagnostic push #pragma clang diagnostic ignored "-Wsign-conversion" +#pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-parameter" #endif @@ -70,6 +73,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. #endif #ifdef __clang__ +#pragma clang diagnostic push #pragma clang diagnostic ignored "-Wunused-parameter" #endif diff --git a/sql/sigs/pgrouting--2.5.3.sig b/sql/sigs/pgrouting--2.5.3.sig new file mode 100644 index 0000000..5442d9d --- /dev/null +++ b/sql/sigs/pgrouting--2.5.3.sig @@ -0,0 +1,185 @@ +#VERSION pgrouting 2.5.3 +#TYPES +pgr_costresult +pgr_costresult3 +pgr_geomresult +#FUNCTIONS +pgr_alphashape(text,double precision) +pgr_analyzegraph(text,double precision,text,text,text,text,text) +pgr_analyzeoneway(text,text[],text[],text[],text[],boolean,text,text,text) +pgr_apspjohnson(text) +pgr_apspwarshall(text,boolean,boolean) +pgr_articulationpoints(text) +pgr_astarcostmatrix(text,anyarray,boolean,integer,double precision,double precision) +pgr_astarcost(text,anyarray,anyarray,boolean,integer,double precision,double precision) +pgr_astarcost(text,anyarray,bigint,boolean,integer,double precision,double precision) +pgr_astarcost(text,bigint,anyarray,boolean,integer,double precision,double precision) +pgr_astarcost(text,bigint,bigint,boolean,integer,double precision,double precision) +pgr_astar(text,anyarray,anyarray,boolean,integer,double precision,double precision) +_pgr_astar(text,anyarray,anyarray,boolean,integer,double precision,double precision,boolean,boolean) +pgr_astar(text,anyarray,bigint,boolean,integer,double precision,double precision) +pgr_astar(text,bigint,anyarray,boolean,integer,double precision,double precision) +pgr_astar(text,bigint,bigint,boolean,integer,double precision,double precision) +pgr_astar(text,integer,integer,boolean,boolean) +pgr_bdastarcostmatrix(text,anyarray,boolean,integer,numeric,numeric) +pgr_bdastarcost(text,anyarray,anyarray,boolean,integer,numeric,numeric) +pgr_bdastarcost(text,anyarray,bigint,boolean,integer,numeric,numeric) +pgr_bdastarcost(text,bigint,anyarray,boolean,integer,numeric,numeric) +pgr_bdastarcost(text,bigint,bigint,boolean,integer,numeric,numeric) +_pgr_bdastar(text,anyarray,anyarray,boolean,integer,double precision,double precision,boolean) +pgr_bdastar(text,anyarray,anyarray,boolean,integer,numeric,numeric) +pgr_bdastar(text,anyarray,bigint,boolean,integer,numeric,numeric) +pgr_bdastar(text,bigint,anyarray,boolean,integer,numeric,numeric) +pgr_bdastar(text,bigint,bigint) +pgr_bdastar(text,bigint,bigint,boolean,integer,numeric,numeric) +pgr_bdastar(text,integer,integer,boolean,boolean) +pgr_bddijkstracostmatrix(text,anyarray,boolean) +pgr_bddijkstracost(text,anyarray,anyarray,boolean) +pgr_bddijkstracost(text,anyarray,bigint,boolean) +pgr_bddijkstracost(text,bigint,anyarray,boolean) +pgr_bddijkstracost(text,bigint,bigint,boolean) +pgr_bddijkstra(text,anyarray,anyarray,boolean) +_pgr_bddijkstra(text,anyarray,anyarray,boolean,boolean) +pgr_bddijkstra(text,anyarray,bigint,boolean) +pgr_bddijkstra(text,bigint,anyarray,boolean) +pgr_bddijkstra(text,bigint,bigint) +pgr_bddijkstra(text,bigint,bigint,boolean) +pgr_bddijkstra(text,integer,integer,boolean,boolean) +pgr_biconnectedcomponents(text) +pgr_boykovkolmogorov(text,anyarray,anyarray) +pgr_boykovkolmogorov(text,anyarray,bigint) +pgr_boykovkolmogorov(text,bigint,anyarray) +pgr_boykovkolmogorov(text,bigint,bigint) +pgr_bridges(text) +_pgr_checkverttab(text,text[],integer,text) +pgr_connectedcomponents(text) +pgr_contractgraph(text,bigint[],integer,bigint[],boolean) +_pgr_createindex(text,text,text,integer,text) +_pgr_createindex(text,text,text,text,integer,text) +pgr_createtopology(text,double precision,text,text,text,text,text,boolean) +pgr_createverticestable(text,text,text,text,text) +pgr_dijkstracostmatrix(text,anyarray,boolean) +pgr_dijkstracost(text,anyarray,anyarray,boolean) +pgr_dijkstracost(text,anyarray,bigint,boolean) +pgr_dijkstracost(text,bigint,anyarray,boolean) +pgr_dijkstracost(text,bigint,bigint,boolean) +pgr_dijkstra(text,anyarray,anyarray,boolean) +_pgr_dijkstra(text,anyarray,anyarray,boolean,boolean,boolean) +pgr_dijkstra(text,anyarray,bigint,boolean) +pgr_dijkstra(text,bigint,anyarray,boolean) +pgr_dijkstra(text,bigint,bigint) +pgr_dijkstra(text,bigint,bigint,boolean) +pgr_dijkstra(text,integer,integer,boolean,boolean) +pgr_dijkstravia(text,anyarray,boolean,boolean,boolean) +pgr_drivingdistance(text,anyarray,double precision,boolean,boolean) +pgr_drivingdistance(text,bigint,double precision,boolean) +pgr_drivingdistance(text,bigint,double precision,boolean,boolean) +pgr_edgedisjointpaths(text,anyarray,anyarray,boolean) +pgr_edgedisjointpaths(text,anyarray,bigint,boolean) +pgr_edgedisjointpaths(text,bigint,anyarray,boolean) +pgr_edgedisjointpaths(text,bigint,bigint,boolean) +pgr_edmondskarp(text,anyarray,anyarray) +pgr_edmondskarp(text,anyarray,bigint) +pgr_edmondskarp(text,bigint,anyarray) +pgr_edmondskarp(text,bigint,bigint) +_pgr_endpoint(geometry) +pgr_endpoint(geometry) +pgr_euclediantsp(text,bigint,bigint,double precision,integer,integer,integer,double precision,double precision,double precision,boolean) +pgr_flipedges(geometry[]) +pgr_floydwarshall(text,boolean) +pgr_getcolumnname(text,text) +_pgr_getcolumnname(text,text,integer,text) +_pgr_getcolumnname(text,text,text,integer,text) +_pgr_getcolumntype(text,text,integer,text) +_pgr_getcolumntype(text,text,text,integer,text) +_pgr_get_statement(text) +pgr_gettablename(text) +_pgr_gettablename(text,integer,text) +_pgr_gsoc_vrppdtw(text,integer,double precision,double precision,integer) +pgr_gsoc_vrppdtw(text,integer,integer) +pgr_iscolumnindexed(text,text) +_pgr_iscolumnindexed(text,text,integer,text) +_pgr_iscolumnindexed(text,text,text,integer,text) +_pgr_iscolumnintable(text,text) +pgr_iscolumnintable(text,text) +pgr_johnson(text,boolean) +pgr_kdijkstracost(text,integer,integer[],boolean,boolean) +pgr_kdijkstrapath(text,integer,integer[],boolean,boolean) +_pgr_ksp(text,bigint,bigint,integer,boolean,boolean) +pgr_ksp(text,bigint,bigint,integer,boolean,boolean) +pgr_ksp(text,integer,integer,integer,boolean) +pgr_labelgraph(text,text,text,text,text,text) +pgr_linegraph(text,boolean) +_pgr_makedistancematrix(text) +pgr_maxcardinalitymatch(text,boolean) +pgr_maxflowboykovkolmogorov(text,anyarray,anyarray) +pgr_maxflowboykovkolmogorov(text,anyarray,bigint) +pgr_maxflowboykovkolmogorov(text,bigint,anyarray) +pgr_maxflowboykovkolmogorov(text,bigint,bigint) +pgr_maxflowedmondskarp(text,anyarray,anyarray) +pgr_maxflowedmondskarp(text,anyarray,bigint) +pgr_maxflowedmondskarp(text,bigint,anyarray) +pgr_maxflowedmondskarp(text,bigint,bigint) +pgr_maxflowpushrelabel(text,anyarray,anyarray) +pgr_maxflowpushrelabel(text,anyarray,bigint) +pgr_maxflowpushrelabel(text,bigint,anyarray) +pgr_maxflowpushrelabel(text,bigint,bigint) +pgr_maxflow(text,anyarray,anyarray) +_pgr_maxflow(text,anyarray,anyarray,integer,boolean) +pgr_maxflow(text,anyarray,bigint) +pgr_maxflow(text,bigint,anyarray) +pgr_maxflow(text,bigint,bigint) +pgr_maximumcardinalitymatching(text,boolean) +_pgr_msg(integer,text,text) +pgr_nodenetwork(text,double precision,text,text,text,text,boolean) +_pgr_onerror(boolean,integer,text,text,text,text) +_pgr_parameter_check(text,text,boolean) +_pgr_pickdelivereuclidean(text,text,double precision,integer,integer) +_pgr_pickdeliver(text,text,text,double precision,integer,integer) +pgr_pointsaspolygon(character varying,double precision) +pgr_pointstodmatrix(geometry[],integer) +pgr_pointstovids(geometry[],text,double precision) +pgr_pointtoedgenode(text,geometry,double precision) +_pgr_pointtoid(geometry,double precision,text,integer) +pgr_pushrelabel(text,anyarray,anyarray) +pgr_pushrelabel(text,anyarray,bigint) +pgr_pushrelabel(text,bigint,anyarray) +pgr_pushrelabel(text,bigint,bigint) +_pgr_quote_ident(text) +pgr_quote_ident(text) +_pgr_startpoint(geometry) +pgr_startpoint(geometry) +pgr_strongcomponents(text) +pgr_texttopoints(text,integer) +_pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text) +pgr_trsp(text,integer,double precision,integer,double precision,boolean,boolean,text) +_pgr_trsp(text,integer,integer,boolean,boolean,text) +pgr_trsp(text,integer,integer,boolean,boolean,text) +pgr_trspviaedges(text,integer[],double precision[],boolean,boolean,text) +pgr_trspviavertices(text,anyarray,boolean,boolean,text) +_pgr_trspviavertices(text,integer[],boolean,boolean,text) +pgr_tsp(double precision[],integer,integer) +pgr_tsp(text,bigint,bigint,double precision,integer,integer,integer,double precision,double precision,double precision,boolean) +pgr_tsp(text,integer,integer) +_pgr_unnest_matrix(double precision[]) +pgr_version() +_pgr_versionless(text,text) +pgr_versionless(text,text) +pgr_vidstodmatrix(integer[],geometry[],text,double precision) +pgr_vidstodmatrix(text,integer[],boolean,boolean,boolean) +_pgr_vrponedepot(text,text,text,integer) +pgr_vrponedepot(text,text,text,integer) +pgr_withpointscostmatrix(text,text,anyarray,boolean,character) +pgr_withpointscost(text,text,anyarray,anyarray,boolean,character) +pgr_withpointscost(text,text,anyarray,bigint,boolean,character) +pgr_withpointscost(text,text,bigint,anyarray,boolean,character) +pgr_withpointscost(text,text,bigint,bigint,boolean,character) +pgr_withpointsdd(text,text,anyarray,double precision,boolean,character,boolean,boolean) +pgr_withpointsdd(text,text,bigint,double precision,boolean,character,boolean) +pgr_withpointsksp(text,text,bigint,bigint,integer,boolean,boolean,character,boolean) +pgr_withpoints(text,text,anyarray,anyarray,boolean,character,boolean) +_pgr_withpoints(text,text,anyarray,anyarray,boolean,character,boolean,boolean,boolean) +pgr_withpoints(text,text,anyarray,bigint,boolean,character,boolean) +pgr_withpoints(text,text,bigint,anyarray,boolean,character,boolean) +pgr_withpoints(text,text,bigint,bigint,boolean,character,boolean) +_pgr_withpointsvia(text,bigint[],double precision[],boolean) diff --git a/src/alpha_shape/src/alpha.c b/src/alpha_shape/src/alpha.c index 7122b53..f239f01 100644 --- a/src/alpha_shape/src/alpha.c +++ b/src/alpha_shape/src/alpha.c @@ -115,7 +115,7 @@ static int compute_alpha_shape(char* sql, float8 alpha, vertex_t **res, size_t * int SPIcode; void *SPIplan; Portal SPIportal; - bool moredata = TRUE; + bool moredata = true; size_t ntuples; vertex_t *vertices = NULL; size_t total_tuples = 0; @@ -146,8 +146,8 @@ static int compute_alpha_shape(char* sql, float8 alpha, vertex_t **res, size_t * return -1; } - while (moredata == TRUE) { - SPI_cursor_fetch(SPIportal, TRUE, TUPLIMIT); + while (moredata == true) { + SPI_cursor_fetch(SPIportal, true, TUPLIMIT); if (vertex_columns.id == -1) { if (fetch_vertices_columns(SPI_tuptable, &vertex_columns) == -1) @@ -178,7 +178,7 @@ static int compute_alpha_shape(char* sql, float8 alpha, vertex_t **res, size_t * } SPI_freetuptable(tuptable); } else { - moredata = FALSE; + moredata = false; } } diff --git a/src/common/src/coordinates_input.c b/src/common/src/coordinates_input.c index 80020db..d8d1441 100644 --- a/src/common/src/coordinates_input.c +++ b/src/common/src/coordinates_input.c @@ -89,13 +89,13 @@ void pgr_get_coordinates( SPIportal = pgr_SPI_cursor_open(SPIplan); - bool moredata = TRUE; + bool moredata = true; (*total_coordinates) = total_tuples; int64_t default_id = 1; - while (moredata == TRUE) { - SPI_cursor_fetch(SPIportal, TRUE, tuple_limit); + while (moredata == true) { + SPI_cursor_fetch(SPIportal, true, tuple_limit); if (total_tuples == 0) pgr_fetch_column_info(info, 3); @@ -128,7 +128,7 @@ void pgr_get_coordinates( } SPI_freetuptable(tuptable); } else { - moredata = FALSE; + moredata = false; } } diff --git a/src/common/src/edges_input.c b/src/common/src/edges_input.c index 2d816a2..e58308b 100644 --- a/src/common/src/edges_input.c +++ b/src/common/src/edges_input.c @@ -184,13 +184,13 @@ get_edges_9_columns( SPIportal = pgr_SPI_cursor_open(SPIplan); - bool moredata = TRUE; + bool moredata = true; (*total_edges) = total_tuples = valid_edges = 0; int64_t default_id = 0; - while (moredata == TRUE) { - SPI_cursor_fetch(SPIportal, TRUE, tuple_limit); + while (moredata == true) { + SPI_cursor_fetch(SPIportal, true, tuple_limit); if (total_tuples == 0) pgr_fetch_column_info(info, 9); @@ -221,7 +221,7 @@ get_edges_9_columns( } SPI_freetuptable(tuptable); } else { - moredata = FALSE; + moredata = false; } } @@ -283,13 +283,13 @@ get_edges_5_columns( SPIportal = pgr_SPI_cursor_open(SPIplan); - bool moredata = TRUE; + bool moredata = true; (*totalTuples) = total_tuples = valid_edges = 0; int64_t default_id = 0; - while (moredata == TRUE) { - SPI_cursor_fetch(SPIportal, TRUE, tuple_limit); + while (moredata == true) { + SPI_cursor_fetch(SPIportal, true, tuple_limit); if (total_tuples == 0) pgr_fetch_column_info(info, 5); @@ -321,7 +321,7 @@ get_edges_5_columns( } SPI_freetuptable(tuptable); } else { - moredata = FALSE; + moredata = false; } } @@ -376,13 +376,13 @@ get_edges_flow( SPIportal = pgr_SPI_cursor_open(SPIplan); - bool moredata = TRUE; + bool moredata = true; (*totalTuples) = total_tuples = valid_edges = 0; int64_t default_id = 0; - while (moredata == TRUE) { - SPI_cursor_fetch(SPIportal, TRUE, tuple_limit); + while (moredata == true) { + SPI_cursor_fetch(SPIportal, true, tuple_limit); if (total_tuples == 0) pgr_fetch_column_info(info, 5); @@ -413,7 +413,7 @@ get_edges_flow( } SPI_freetuptable(tuptable); } else { - moredata = FALSE; + moredata = false; } } @@ -472,13 +472,13 @@ get_edges_basic( SPIportal = pgr_SPI_cursor_open(SPIplan); - bool moredata = TRUE; + bool moredata = true; (*totalTuples) = total_tuples = valid_edges = 0; int64_t default_id = 0; - while (moredata == TRUE) { - SPI_cursor_fetch(SPIportal, TRUE, tuple_limit); + while (moredata == true) { + SPI_cursor_fetch(SPIportal, true, tuple_limit); if (total_tuples == 0) pgr_fetch_column_info(info, 5); @@ -510,7 +510,7 @@ get_edges_basic( } SPI_freetuptable(tuptable); } else { - moredata = FALSE; + moredata = false; } } diff --git a/src/common/src/matrixRows_input.c b/src/common/src/matrixRows_input.c index 984a89e..9c82796 100644 --- a/src/common/src/matrixRows_input.c +++ b/src/common/src/matrixRows_input.c @@ -82,11 +82,11 @@ void pgr_get_matrixRows( SPIportal = pgr_SPI_cursor_open(SPIplan); - bool moredata = TRUE; + bool moredata = true; (*total_rows) = total_tuples; - while (moredata == TRUE) { - SPI_cursor_fetch(SPIportal, TRUE, tuple_limit); + while (moredata == true) { + SPI_cursor_fetch(SPIportal, true, tuple_limit); if (total_tuples == 0) pgr_fetch_column_info(info, 3); @@ -117,7 +117,7 @@ void pgr_get_matrixRows( } SPI_freetuptable(tuptable); } else { - moredata = FALSE; + moredata = false; } } diff --git a/src/common/src/orders_input.c b/src/common/src/orders_input.c index 3c4549d..54ac7bf 100644 --- a/src/common/src/orders_input.c +++ b/src/common/src/orders_input.c @@ -144,13 +144,13 @@ pgr_get_pd_orders_general( Portal SPIportal; SPIportal = pgr_SPI_cursor_open(SPIplan); - bool moredata = TRUE; + bool moredata = true; (*total_pd_orders) = total_tuples = 0; /* on the first tuple get the column numbers */ - while (moredata == TRUE) { - SPI_cursor_fetch(SPIportal, TRUE, tuple_limit); + while (moredata == true) { + SPI_cursor_fetch(SPIportal, true, tuple_limit); if (total_tuples == 0) { pgr_fetch_column_info(info, 14); } @@ -181,7 +181,7 @@ pgr_get_pd_orders_general( } SPI_freetuptable(tuptable); } else { - moredata = FALSE; + moredata = false; } } diff --git a/src/common/src/points_input.c b/src/common/src/points_input.c index 54ca17f..249e863 100644 --- a/src/common/src/points_input.c +++ b/src/common/src/points_input.c @@ -95,14 +95,14 @@ pgr_get_points( Portal SPIportal; SPIportal = pgr_SPI_cursor_open(SPIplan); - bool moredata = TRUE; + bool moredata = true; (*total_points) = total_tuples = 0; int64_t default_pid = 0; char default_side = 'b'; - while (moredata == TRUE) { - SPI_cursor_fetch(SPIportal, TRUE, tuple_limit); + while (moredata == true) { + SPI_cursor_fetch(SPIportal, true, tuple_limit); if (total_tuples == 0) { /* on the first tuple get the column information */ pgr_fetch_column_info(info, 4); @@ -136,7 +136,7 @@ pgr_get_points( } SPI_freetuptable(tuptable); } else { - moredata = FALSE; + moredata = false; } } SPI_cursor_close(SPIportal); diff --git a/src/common/src/restrict_input.c b/src/common/src/restrict_input.c index 2012a3f..825e0b4 100644 --- a/src/common/src/restrict_input.c +++ b/src/common/src/restrict_input.c @@ -115,12 +115,12 @@ pgr_get_restriction_data( Portal SPIportal; SPIportal = pgr_SPI_cursor_open(SPIplan); - bool moredata = TRUE; + bool moredata = true; (*total_restrictions) = total_tuples = 0; - while (moredata == TRUE) { - SPI_cursor_fetch(SPIportal, TRUE, tuple_limit); + while (moredata == true) { + SPI_cursor_fetch(SPIportal, true, tuple_limit); if (total_tuples == 0) { pgr_fetch_column_info(info, 3); } @@ -151,7 +151,7 @@ pgr_get_restriction_data( } SPI_freetuptable(tuptable); } else { - moredata = FALSE; + moredata = false; } } diff --git a/src/common/src/restrictions_input.c b/src/common/src/restrictions_input.c index 7d03428..a955267 100644 --- a/src/common/src/restrictions_input.c +++ b/src/common/src/restrictions_input.c @@ -99,13 +99,13 @@ pgr_get_restriction_data( Portal SPIportal; SPIportal = pgr_SPI_cursor_open(SPIplan); - bool moredata = TRUE; + bool moredata = true; (*total_restrictions) = total_tuples = 0; /* on the first tuple get the column numbers */ - while (moredata == TRUE) { - SPI_cursor_fetch(SPIportal, TRUE, tuple_limit); + while (moredata == true) { + SPI_cursor_fetch(SPIportal, true, tuple_limit); if (total_tuples == 0) { pgr_fetch_column_info(info, 3); } @@ -136,7 +136,7 @@ pgr_get_restriction_data( } SPI_freetuptable(tuptable); } else { - moredata = FALSE; + moredata = false; } } diff --git a/src/common/src/vehicles_input.c b/src/common/src/vehicles_input.c index 8768d4f..0ff70bc 100644 --- a/src/common/src/vehicles_input.c +++ b/src/common/src/vehicles_input.c @@ -198,13 +198,13 @@ void pgr_get_vehicles_general( Portal SPIportal; SPIportal = pgr_SPI_cursor_open(SPIplan); - bool moredata = TRUE; + bool moredata = true; (*total_vehicles) = total_tuples = 0; /* on the first tuple get the column numbers */ - while (moredata == TRUE) { - SPI_cursor_fetch(SPIportal, TRUE, tuple_limit); + while (moredata == true) { + SPI_cursor_fetch(SPIportal, true, tuple_limit); if (total_tuples == 0) { pgr_fetch_column_info(info, 16); } @@ -235,7 +235,7 @@ void pgr_get_vehicles_general( } SPI_freetuptable(tuptable); } else { - moredata = FALSE; + moredata = false; } } diff --git a/src/common/test/doc-pgr_version.result b/src/common/test/doc-pgr_version.result index ccd7e97..af2deba 100644 --- a/src/common/test/doc-pgr_version.result +++ b/src/common/test/doc-pgr_version.result @@ -6,7 +6,7 @@ SET SELECT version FROM pgr_version(); version --------- - 2.5.2 + 2.5.3 (1 row) -- q2 diff --git a/src/trsp/src/trsp.c b/src/trsp/src/trsp.c index f475144..340ce97 100644 --- a/src/trsp/src/trsp.c +++ b/src/trsp/src/trsp.c @@ -299,7 +299,7 @@ static int compute_trsp( int SPIcode; SPIPlanPtr SPIplan; Portal SPIportal; - bool moredata = TRUE; + bool moredata = true; uint32_t TUPLIMIT = 1000; uint32_t ntuples; @@ -348,9 +348,9 @@ static int compute_trsp( return -1; } - while (moredata == TRUE) { + while (moredata == true) { // PGR_DBG("calling SPI_cursor_fetch"); - SPI_cursor_fetch(SPIportal, TRUE, TUPLIMIT); + SPI_cursor_fetch(SPIportal, true, TUPLIMIT); if (SPI_tuptable == NULL) { elog(ERROR, "SPI_tuptable is NULL"); @@ -394,7 +394,7 @@ static int compute_trsp( SPI_freetuptable(tuptable); // PGR_DBG("back from SPI_freetuptable"); } else { - moredata = FALSE; + moredata = false; } } SPI_cursor_close(SPIportal); @@ -480,9 +480,9 @@ static int compute_trsp( return -1; } - moredata = TRUE; - while (moredata == TRUE) { - SPI_cursor_fetch(SPIportal, TRUE, TUPLIMIT); + moredata = true; + while (moredata == true) { + SPI_cursor_fetch(SPIportal, true, TUPLIMIT); if (restrict_columns.target_id == -1) { if (fetch_restrict_columns(SPI_tuptable, &restrict_columns) \ @@ -520,7 +520,7 @@ static int compute_trsp( } SPI_freetuptable(tuptable); } else { - moredata = FALSE; + moredata = false; } } SPI_cursor_close(SPIportal); diff --git a/tools/release-scripts/check-release.sh b/tools/release-scripts/check-release.sh index 9b4b630..e2da1fe 100755 --- a/tools/release-scripts/check-release.sh +++ b/tools/release-scripts/check-release.sh @@ -282,6 +282,7 @@ echo echo "### Checking signature files exist" echo #--------------------------------------------------------------------- +test_file 2.5.3 test_file 2.5.2 test_file 2.5.1 test_file 2.5.0 diff --git a/tools/release-scripts/compile-release.sh b/tools/release-scripts/compile-release.sh index 939a35f..922dbc2 100755 --- a/tools/release-scripts/compile-release.sh +++ b/tools/release-scripts/compile-release.sh @@ -36,7 +36,7 @@ echo Compiling with $1 echo ------------------------------------ echo -sudo update-alternatives --set gcc /usr/bin/gcc-$1 +#sudo update-alternatives --set gcc /usr/bin/gcc-$1 cd build/ touch tmp_make.txt @@ -81,8 +81,8 @@ fi } -sudo rm -f /usr/lib/postgresql/9.3/lib/libpgrouting-$MINOR.so -sudo rm -f /usr/share/postgresql/9.3/extension/pgrouting*$FULL_VER* +#sudo rm -f /usr/lib/postgresql/9.3/lib/libpgrouting-$MINOR.so +#sudo rm -f /usr/share/postgresql/9.3/extension/pgrouting*$FULL_VER* rm -rf build/* test_compile $CPPVERSION diff --git a/tools/testers/algorithm-tester.pl b/tools/testers/algorithm-tester.pl index 3eb0d0d..e3770fc 100755 --- a/tools/testers/algorithm-tester.pl +++ b/tools/testers/algorithm-tester.pl @@ -168,10 +168,11 @@ $postgis_ver = '' if ! $postgis_ver; for my $c (@cfgs) { my $found = 0; + print "test.conf = $c\n" if $VERBOSE; + # load the config file for the tests require $c; - print "test.conf = $c\n" if $VERBOSE; print Data::Dumper->Dump([\%main::tests],['test']) if $VERBOSE; if ($main::tests{any} && !$DOCUMENTATION) { @@ -207,7 +208,7 @@ exit 0; # signal we passed all the tests # t contents of array that has keys comment, data and test sub run_test { my $c = shift; - my $t = shift; + my $t = shift; my %res = (); my $dir = dirname($c); @@ -310,7 +311,7 @@ sub process_single_test{ my @d = (); - @d = <TIN>; #reads the whole file into the array @d + @d = <TIN>; #reads the whole file into the array @d print PSQL "BEGIN;\n"; print PSQL "SET client_min_messages TO $level;\n"; @@ -346,7 +347,7 @@ sub process_single_test{ } if (! -f "$dir/$x.result") { $res->{"$dir/$x.test.sql"} = "\nFAILED: result file missing : $!"; - $stats{z_fail}++; + $stats{z_fail}++; next; } @@ -398,7 +399,7 @@ sub createTestDB { Use -force to force the tests\n" unless version_greater_eq($dbver, $POSGRESQL_MIN_VERSION) or ($FORCE and version_greater_eq($dbver, '9.1')); - die "postGIS extension $postgis_ver not found\n" + die "postGIS extension $postgis_ver not found\n" unless -f "$dbshare/extension/postgis.control"; @@ -463,9 +464,12 @@ sub version_greater_eq { sub getServerVersion { my $v = `$psql $connopts -q -t -c "select version()" postgres`; print "$psql $connopts -q -t -c \"select version()\" postgres\n # RETURNED: $v\n" if $VERBOSE; - if ($v =~ m/PostgreSQL (\d+(\.\d+)?(\.\d+)?)/) { - print " # Got ($1)\n" if $VERBOSE; - return $1; + if ($v =~ m/PostgreSQL (\d+(\.\d+)?)/) { + my $version = $1 + 0; + print " Got: $version\n" if $VERBOSE; + $version = int($version) if $version >= 10; + print " Got: $version\n" if $VERBOSE; + return $version; } return undef; } diff --git a/tools/testers/pg_prove_tests.sh b/tools/testers/pg_prove_tests.sh index 217b827..3fbc631 100755 --- a/tools/testers/pg_prove_tests.sh +++ b/tools/testers/pg_prove_tests.sh @@ -9,14 +9,23 @@ set -e PGUSER=$1 -RELEASE_TYPE="b$2" +PGPORT=$2 +RELEASE_TYPE="b$3" echo "RELEASE_TYPE" $RELEASE_TYPE - +if [ "b$PGPORT" = "b" ] +then + PGPORT="" +else + PGPORT=" -p $PGPORT" +fi PGDATABASE="___pgr___test___" +echo $PGPORT + + # Define alias function for psql command run_psql () { - PGOPTIONS='--client-min-messages=warning' psql -U $PGUSER -d $PGDATABASE -X -q -v ON_ERROR_STOP=1 --pset pager=off "$@" + PGOPTIONS='--client-min-messages=warning' psql $PGPORT -U $PGUSER -d $PGDATABASE -X -q -v ON_ERROR_STOP=1 --pset pager=off "$@" if [ "$?" -ne 0 ] then echo "Test query failed: $@" @@ -34,16 +43,15 @@ run_psql -f setup_db.sql if [ $RELEASE_TYPE = "bDebug" ] then - pg_prove ../../src/internalQueryTests/test/pgtap/* -d $PGDATABASE -U $PGUSER - pg_prove ../../src/tsp/test/performance/* -d $PGDATABASE -U $PGUSER + pg_prove ../../src/internalQueryTests/test/pgtap/* $PGPORT -d $PGDATABASE -U $PGUSER + pg_prove ../../src/tsp/test/performance/* $PGPORT -d $PGDATABASE -U $PGUSER echo "MADE TEST **********************" fi -#pg_prove ../../src/dijkstraTRSP/test/pgtap/* -d $PGDATABASE -U $PGUSER -pg_prove ../../src/lineGraph/test/pgtap/* -d $PGDATABASE -U $PGUSER +pg_prove ../../src/lineGraph/test/pgtap/* $PGPORT -d $PGDATABASE -U $PGUSER -pg_prove -d $PGDATABASE -U $PGUSER ../../pgtap/*/* +pg_prove $PGPORT -d $PGDATABASE -U $PGUSER ../../pgtap/*/* if [ "$?" -ne 0 ] then -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pgrouting.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
![https://travis-ci.org/pgRouting/pgrouting.png?branch=master"](https://travis-ci.org/pgRouting/pgrouting.png?branch=master"){kind=link}
![https://travis-ci.org/pgRouting/pgrouting.png?branch=develop"](https://travis-ci.org/pgRouting/pgrouting.png?branch=develop"){kind=link}