[Git][debian-gis-team/postgis][experimental] 2 commits: Add patch to disable unreliable flageobuf tests.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch experimental at Debian GIS Project / postgis


Commits:
2647c870 by Bas Couwenberg at 2021-11-27T13:09:27+01:00
Add patch to disable unreliable flageobuf tests.

- - - - -
24de0e07 by Bas Couwenberg at 2021-11-27T13:11:16+01:00
Apply patches before running regress tests.

- - - - -


5 changed files:

- debian/changelog
- + debian/patches/flatgeobuf.patch
- debian/patches/series
- debian/tests/control
- debian/tests/regress


Changes:

=====================================
debian/changelog
=====================================
@@ -4,6 +4,8 @@ postgis (3.2.0~beta2+dfsg-1) UNRELEASED; urgency=medium
   * Switch to pcre2.
     (closes: #999986)
   * Drop flatgeobuff.patch, doesn't work for autopkgtest.
+  * Add patch to disable unreliable flageobuf tests.
+  * Apply patches before running regress tests.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 27 Nov 2021 07:16:15 +0100
 


=====================================
debian/patches/flatgeobuf.patch
=====================================
@@ -0,0 +1,42 @@
+Description: Disable unreliable tests.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug: https://trac.osgeo.org/postgis/ticket/5014
+
+--- a/regress/core/flatgeobuf.sql
++++ b/regress/core/flatgeobuf.sql
+@@ -32,14 +32,16 @@ select 'P3', id, ST_AsText(geom) from ST
+ select 'P4', id, ST_AsEWKT(geom) from ST_FromFlatGeobuf(null::flatgeobuf_t1, (
+     select ST_AsFlatGeobuf(q) fgb from (select ST_SetSRID(ST_MakePoint(-71.1043443253471, 42.3150676015829),4326)) q)
+ );
+--- 2D Point with SRID and index
+-select 'P5', id, ST_AsEWKT(geom) from ST_FromFlatGeobuf(null::flatgeobuf_t1, (
+-    select ST_AsFlatGeobuf(q, true) fgb from (select ST_SetSRID(ST_MakePoint(-71.1043443253471, 42.3150676015829),4326)) q)
+-);
+--- Empty Point
+-select 'P6', id, ST_AsEWKT(geom) from ST_FromFlatGeobuf(null::flatgeobuf_t1, (
+-    select ST_AsFlatGeobuf(q, true) fgb from (select ST_GeomFromText('POINT EMPTY')) q)
+-);
++-- Unreliable test: https://trac.osgeo.org/postgis/ticket/5014
++-- -- 2D Point with SRID and index
++-- select 'P5', id, ST_AsEWKT(geom) from ST_FromFlatGeobuf(null::flatgeobuf_t1, (
++--     select ST_AsFlatGeobuf(q, true) fgb from (select ST_SetSRID(ST_MakePoint(-71.1043443253471, 42.3150676015829),4326)) q)
++-- );
++-- Unreliable test: https://trac.osgeo.org/postgis/ticket/5014
++-- -- Empty Point
++-- select 'P6', id, ST_AsEWKT(geom) from ST_FromFlatGeobuf(null::flatgeobuf_t1, (
++--     select ST_AsFlatGeobuf(q, true) fgb from (select ST_GeomFromText('POINT EMPTY')) q)
++-- );
+ 
+ -- 2D LineString
+ select 'L1', id, ST_AsText(geom) from ST_FromFlatGeobuf(null::flatgeobuf_t1, (
+--- a/regress/core/flatgeobuf_expected
++++ b/regress/core/flatgeobuf_expected
+@@ -5,8 +5,6 @@ P1|0|POINT(1.1 2.1)
+ P2|0|POINT Z (1.1 2.11 3.2)
+ P3|0|POINT ZM (1.1 2.12 3.2 4.3)
+ P4|0|SRID=4326;POINT(-71.1043443253471 42.3150676015829)
+-P5|0|SRID=4326;POINT(-71.1043443253471 42.3150676015829)
+-P6|0|
+ L1|0|LINESTRING(1 2,3 4)
+ L2|0|LINESTRING Z (1 2 3,3 4 5)
+ L3|0|LINESTRING ZM (1 2 3 5,3 4 5 6)


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 relax-test-timing-constraints.patch
 chaikin
 incorrect-path-for-interpreter.patch
+flatgeobuf.patch


=====================================
debian/tests/control
=====================================
@@ -1,3 +1,3 @@
-Depends: @, postgresql-server-dev-all, postgresql-all
+Depends: @, postgresql-server-dev-all, postgresql-all, quilt
 Tests: test-extension-creation regress
 Restrictions: allow-stderr, skippable


=====================================
debian/tests/regress
=====================================
@@ -41,6 +41,7 @@ for v in $(pg_buildext installed-versions); do
   esac
   pg_virtualenv -v $v <<-EOF
 	set -eux
+	QUILT_PATCHES=debian/patches quilt push -a
 	make -C regress/core   -f Makefile.in check PERL=perl RUNTESTFLAGS="--extension --verbose" POSTGIS_PGSQL_VERSION=$POSTGIS_PGSQL_VERSION POSTGIS_GEOS_VERSION=$POSTGIS_GEOS_VERSION HAVE_SPGIST=$HAVE_SPGIST
 	make -C sfcgal/regress -f Makefile.in check PERL=perl RUNTESTFLAGS="--extension --verbose" POSTGIS_PGSQL_VERSION=$POSTGIS_PGSQL_VERSION HAVE_SFCGAL=yes
 	EOF



View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/compare/2b18e49c3596d86566da2a1412952876e386a026...24de0e07a8c3886f253a4c8707bf0f7cc844eccb

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/compare/2b18e49c3596d86566da2a1412952876e386a026...24de0e07a8c3886f253a4c8707bf0f7cc844eccb
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20211127/ab35596e/attachment-0001.htm>