[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-752-g41a3acb8d
git at osgeo.org
git at osgeo.org
Thu May 4 17:58:30 PDT 2023
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, master has been updated
via 41a3acb8dbabb93986a9c4d0a484f780e3035351 (commit)
from b1f1d964109844728da87a231701036be1461303 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 41a3acb8dbabb93986a9c4d0a484f780e3035351
Author: Regina Obe <lr at pcorp.us>
Date: Thu May 4 20:57:39 2023 -0400
commit 3d9eb671319b29d6244af592b3158e13bf915f3e
Author: Sandro Santilli <strk at kbt.io>
Date: Thu May 4 21:20:15 2023 +0200
Stop disabling interrupt tests in all bots
commit e1456ebb379ab5c183ca487f950cba0ed119632f
Author: Sandro Santilli <strk at kbt.io>
Date: Thu May 4 20:42:10 2023 +0200
Enable interrupt tests by default
diff --git a/.cirrus.yml b/.cirrus.yml
index 8e27dd7fb..26b3c8ab9 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -17,7 +17,7 @@ task:
- find . -name "*.pl" | xargs sed -i -r 's|/usr/bin/perl|/usr/bin/env perl|'
build_script:
- ./autogen.sh
- - ./configure PKG_CONFIG=/usr/local/bin/pkgconf CFLAGS="-isystem /usr/local/include -Wall -fno-omit-frame-pointer -Werror" LDFLAGS="-L/usr/local/lib" --with-libiconv-prefix=/usr/local --without-gui --without-interrupt-tests --with-topology --without-raster --with-sfcgal=/usr/local/bin/sfcgal-config --with-address-standardizer --with-protobuf
+ - ./configure PKG_CONFIG=/usr/local/bin/pkgconf CFLAGS="-isystem /usr/local/include -Wall -fno-omit-frame-pointer -Werror" LDFLAGS="-L/usr/local/lib" --with-libiconv-prefix=/usr/local --without-gui --with-topology --without-raster --with-sfcgal=/usr/local/bin/sfcgal-config --with-address-standardizer --with-protobuf
- service postgresql oneinitdb
- service postgresql onestart
- su postgres -c "createuser -s `whoami`"
diff --git a/ci/bessie/postgis_regress.sh b/ci/bessie/postgis_regress.sh
index 8add89303..eb7d75edd 100644
--- a/ci/bessie/postgis_regress.sh
+++ b/ci/bessie/postgis_regress.sh
@@ -5,7 +5,11 @@ set -e
#BRANCH is passed in via jenkins which is set via webhook hook
export PATH=${PATH}:/usr/local:/usr/local/lib:/usr/local/bin
sh autogen.sh
-./configure --with-projdir=/usr/local --with-libiconv=/usr/local --without-interrupt-tests --with-library-minor-version --without-raster
+./configure \
+ --with-projdir=/usr/local \
+ --with-libiconv=/usr/local \
+ --with-library-minor-version \
+ --without-raster
#make distclean
make
export PGUSER=postgres
diff --git a/ci/bessie32/postgis_regress.sh b/ci/bessie32/postgis_regress.sh
index 951698325..82d86a6de 100644
--- a/ci/bessie32/postgis_regress.sh
+++ b/ci/bessie32/postgis_regress.sh
@@ -9,7 +9,17 @@ export CXXFLAGS="-O2 -pipe -fstack-protector-strong -Wl,-rpath=/usr/local/lib/g
export CFLAGS="-Wall -Wmissing-prototypes -Wpointer-arith -Wendif-labels -Wmissing-format-attribute -Wformat-security -fno-strict-aliasing -fwrapv -fexcess-precision=standard -Wno-format-trunc"
export PATH=${PATH}:/usr/local:/usr/local/lib:/usr/local/bin
sh autogen.sh
-./configure PKG_CONFIG=/usr/local/bin/pkgconf LDFLAGS="-L/usr/local/lib" --with-libiconv-prefix=/usr/local --without-gui --without-interrupt-tests --with-topology --with-raster --with-sfcgal=/usr/local/bin/sfcgal-config --with-address-standardizer --with-protobuf --with-wagyu
+./configure \
+ PKG_CONFIG=/usr/local/bin/pkgconf \
+ LDFLAGS="-L/usr/local/lib" \
+ --with-libiconv-prefix=/usr/local \
+ --without-gui \
+ --with-topology \
+ --with-raster \
+ --with-sfcgal=/usr/local/bin/sfcgal-config \
+ --with-address-standardizer \
+ --with-protobuf \
+ --with-wagyu
#make distclean
make
diff --git a/ci/debbie/postgis_regress.sh b/ci/debbie/postgis_regress.sh
index 1aae9dd54..f2aa5ff17 100644
--- a/ci/debbie/postgis_regress.sh
+++ b/ci/debbie/postgis_regress.sh
@@ -63,7 +63,6 @@ fi
--with-pgconfig=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}/bin/pg_config \
--with-geosconfig=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/bin/geos-config \
--with-gdalconfig=${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}/bin/gdal-config \
- --without-interrupt-tests \
--prefix=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD} --with-library-minor-version
make clean
make
diff --git a/ci/dronie/postgis_regress.sh b/ci/dronie/postgis_regress.sh
index 0ee30f6da..48b5c30d1 100644
--- a/ci/dronie/postgis_regress.sh
+++ b/ci/dronie/postgis_regress.sh
@@ -16,7 +16,9 @@ SRCDIR=$PWD
BUILDDIR=/tmp/postgis-build/${PGVER}
mkdir -p "${BUILDDIR}"
cd "${BUILDDIR}"
-${SRCDIR}/configure CFLAGS="-O2 -Wall -fno-omit-frame-pointer -Werror" --without-interrupt-tests --enable-lto
+${SRCDIR}/configure \
+ CFLAGS="-O2 -Wall -fno-omit-frame-pointer -Werror" \
+ --enable-lto
make -j
# we should maybe wait for postgresql service to startup here...
diff --git a/ci/dronie/postgis_regress_alpine.sh b/ci/dronie/postgis_regress_alpine.sh
index 66a194fff..458aebb5f 100644
--- a/ci/dronie/postgis_regress_alpine.sh
+++ b/ci/dronie/postgis_regress_alpine.sh
@@ -8,7 +8,8 @@ su - postgres -c "export PGDATA=/var/lib/postgresql/data && pg_ctl -o '-F' -l /v
export PGPORT=5432
psql --version
./autogen.sh
-./configure CFLAGS="-O2 -Wall -fno-omit-frame-pointer -Werror" --without-interrupt-tests
+./configure \
+ CFLAGS="-O2 -Wall -fno-omit-frame-pointer -Werror"
make clean
make -j
# we should maybe wait for postgresql service to startup here...
diff --git a/ci/winnie/build_postgis.sh b/ci/winnie/build_postgis.sh
index 67ed5be23..7cbfae727 100644
--- a/ci/winnie/build_postgis.sh
+++ b/ci/winnie/build_postgis.sh
@@ -153,7 +153,6 @@ LDFLAGS="-Wl,--enable-auto-import -L${PGPATH}/lib -L${PROJECTS}/rel-libiconv-${I
--with-xsldir=${PROJECTS}/docbook/docbook-xsl-1.76.1 \
--with-gui --with-gettext=no \
--with-sfcgal=${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/sfcgal-config \
- --without-interrupt-tests \
--prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE} --with-library-minor-version
#exit
else
@@ -167,7 +166,6 @@ LDFLAGS="-L${PGPATH}/lib -L${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYP
--with-gui --with-gettext=no \
--with-libiconv=${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE} \
--with-xsldir=${PROJECTS}/docbook/docbook-xsl-1.76.1 \
- --without-interrupt-tests \
--prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE} --with-library-minor-version
fi;
diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index 87fa159eb..163eba6a1 100644
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -164,7 +164,6 @@ LDFLAGS="-Wl,--enable-auto-import -L${PGPATH}/lib -L${PROJECTS}/rel-libiconv-${I
--with-xsldir=${PROJECTS}/docbook/docbook-xsl-1.76.1 \
--with-gui --with-gettext=no \
--with-sfcgal=${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/sfcgal-config \
- --without-interrupt-tests \
--prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE} --with-library-minor-version
#exit
else
@@ -177,7 +176,6 @@ LDFLAGS="-L${PGPATH}/lib -L${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYP
--with-gui --with-gettext=no \
--with-libiconv=${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE} \
--with-xsldir=${PROJECTS}/docbook/docbook-xsl-1.76.1 \
- --without-interrupt-tests \
--prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE} --with-library-minor-version
fi;
diff --git a/configure.ac b/configure.ac
index 7c26b9382..b673cca3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1362,11 +1362,11 @@ AC_SUBST([TOPOLOGY])
dnl ====================================
dnl interrupt tests
dnl ====================================
-INTERRUPTTESTS="no"
+INTERRUPTTESTS="yes"
AC_ARG_WITH([interrupt-tests],
- [AS_HELP_STRING([--with-interrupt-tests],
- [Enable the interrupt tests])],
- [INTERRUPTTESTS="yes"], [])
+ [AS_HELP_STRING([--without-interrupt-tests],
+ [Disable the interrupt tests])],
+ [INTERRUPTTESTS="yes"], [INTERRUPTTEST="no"])
if test "x$with_interrupt_tests" = "xno"; then
INTERRUPTTESTS="no"
-----------------------------------------------------------------------
Summary of changes:
.cirrus.yml | 2 +-
ci/bessie/postgis_regress.sh | 6 +++++-
ci/bessie32/postgis_regress.sh | 12 +++++++++++-
ci/debbie/postgis_regress.sh | 1 -
ci/dronie/postgis_regress.sh | 4 +++-
ci/dronie/postgis_regress_alpine.sh | 3 ++-
ci/winnie/build_postgis.sh | 2 --
ci/winnie/regress_postgis.sh | 2 --
configure.ac | 8 ++++----
9 files changed, 26 insertions(+), 14 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list