[Git][debian-gis-team/postgis][experimental] 3 commits: Add upstream patch to fix test failure on i386.

[Bas Couwenberg (@sebastic)]

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


Commits:
8eb49226 by Bas Couwenberg at 2022-07-24T07:24:41+02:00
Add upstream patch to fix test failure on i386.

- - - - -
b4b5163a by Bas Couwenberg at 2022-07-24T07:25:36+02:00
Don't ignore test failures on i386.

Revert "Ignore test failures on i386."

This reverts commit 8b35a4d3bcad11f69cbe71444cc52bd06953ecb3.

- - - - -
a6f71f7a by Bas Couwenberg at 2022-07-24T07:27:24+02:00
Set distribution to experimental.

- - - - -


5 changed files:

- debian/changelog
- + debian/patches/basic_test.patch
- debian/patches/series
- debian/rules
- debian/tests/test-extension-creation


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+postgis (3.3.0~beta2+dfsg-1~exp2) experimental; urgency=medium
+
+  * Add upstream patch to fix test failure on i386.
+  * Don't ignore test failures on i386.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 24 Jul 2022 07:27:12 +0200
+
 postgis (3.3.0~beta2+dfsg-1~exp1) experimental; urgency=medium
 
   * New upstream beta release.


=====================================
debian/patches/basic_test.patch
=====================================
@@ -0,0 +1,43 @@
+Description: Minimum Bounding Circle regress failure on i386 Debian
+ Revise test to ignore micro floating point difference
+Author: Regina Obe <lr at pcorp.us>
+Origin: https://trac.osgeo.org/postgis/changeset/8cff748a310253c20b769f13419cb2363e5160f8/git
+Bug: https://trac.osgeo.org/postgis/ticket/5157
+
+--- a/liblwgeom/cunit/cu_minimum_bounding_circle.c
++++ b/liblwgeom/cunit/cu_minimum_bounding_circle.c
+@@ -22,17 +22,26 @@ static void mbc_test(LWGEOM* g)
+ 
+ 	POINT2D p;
+ 	POINT4D p4;
++	char *msg1 = "mbc_test failed (got %.12f should be less than radius %.12f) \n";
+ 	while (lwpointiterator_next(it, &p4))
+ 	{
+-		p.x = p4.x;
+-		p.y = p4.y;
++			p.x = p4.x;
++			p.y = p4.y;
+ 
+-		/* We need to store the distance in a variable before the assert so that
+-		 * it is rounded from its 80-bit representation (on x86) down to 64 bits.
+-		 * */
+-		volatile double d = distance2d_pt_pt(result->center, &p);
+-
+-		CU_ASSERT_TRUE(d <= result->radius);
++			/* We need to store the distance in a variable before the assert so that
++				* it is rounded from its 80-bit representation (on x86) down to 64 bits.
++				* */
++			volatile double d = distance2d_pt_pt(result->center, &p);
++			//char *msg1 = "mbc_test failed (got %.12f expected %.12f) \n";
++			if ( (d - result->radius) > 0.0000001  )
++			{
++							printf(msg1, d, result->radius);
++							CU_FAIL();
++			}
++			else
++			{
++							CU_PASS();
++			}
+ 	}
+ 
+ 	lwboundingcircle_destroy(result);


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


=====================================
debian/rules
=====================================
@@ -153,7 +153,7 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 #   Run unit tests (against the newest Postgres version, first)
 	echo " ### testing $(NEWEST_POSTGRES_VERSION) ###"
 # Ignore test failure on problematic architectures
-ifneq (,$(filter $(DEB_BUILD_ARCH),i386 mips mips64el mipsel s390x alpha hppa hurd-i386 kfreebsd-i386 powerpc ppc64 sparc64))
+ifneq (,$(filter $(DEB_BUILD_ARCH),mips mips64el mipsel s390x alpha hppa hurd-i386 kfreebsd-i386 powerpc ppc64 sparc64))
 	pg_virtualenv -v $(NEWEST_POSTGRES_VERSION) \
 		make check RUNTESTFLAGS="-v" || echo "Ignoring test failures"
 else
@@ -162,7 +162,7 @@ else
 endif
 
 #	Test against all other Postgres versions
-ifneq (,$(filter $(DEB_BUILD_ARCH),i386 mips mips64el mipsel s390x alpha hppa hurd-i386 kfreebsd-i386 powerpc ppc64 sparc64))
+ifneq (,$(filter $(DEB_BUILD_ARCH),mips mips64el mipsel s390x alpha hppa hurd-i386 kfreebsd-i386 powerpc ppc64 sparc64))
 	set -e; \
 	for PGVER in $(OTHER_POSTGRES_VERSIONS); do \
 		echo " ### testing $$PGVER ###"; \


=====================================
debian/tests/test-extension-creation
=====================================
@@ -8,7 +8,7 @@ unset LC_ALL LANGUAGE
 # Skip tests on problematic architectures
 ARCH="$(dpkg-architecture -qDEB_BUILD_ARCH)"
 
-if [ [ "${ARCH}" = "i386" ] || "${ARCH}" = "armel" ] || [ "${ARCH}" = "armhf" ] || [ "${ARCH}" = "mips" ] || [ "${ARCH}" = "mips64el" ] || [ "${ARCH}" = "mipsel" ] || [ "${ARCH}" = "s390x" ] || [ "${ARCH}" = "alpha" ] || [ "${ARCH}" = "hppa" ] || [ "${ARCH}" = "hurd-i386" ] || [ "${ARCH}" = "kfreebsd-i386" ] || [ "${ARCH}" = "powerpc" ] || [ "${ARCH}" = "ppc64" ] || [ "${ARCH}" = "sparc64" ]; then
+if [ "${ARCH}" = "armel" ] || [ "${ARCH}" = "armhf" ] || [ "${ARCH}" = "mips" ] || [ "${ARCH}" = "mips64el" ] || [ "${ARCH}" = "mipsel" ] || [ "${ARCH}" = "s390x" ] || [ "${ARCH}" = "alpha" ] || [ "${ARCH}" = "hppa" ] || [ "${ARCH}" = "hurd-i386" ] || [ "${ARCH}" = "kfreebsd-i386" ] || [ "${ARCH}" = "powerpc" ] || [ "${ARCH}" = "ppc64" ] || [ "${ARCH}" = "sparc64" ]; then
   echo "Skipping tests on problematic architectures"
   exit 77
 fi



View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/compare/9ba6877a4a0377ca33ae7ec0c83fbbb710b820d1...a6f71f7a034668a1ba80c02f2affdedc831e68e0

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/compare/9ba6877a4a0377ca33ae7ec0c83fbbb710b820d1...a6f71f7a034668a1ba80c02f2affdedc831e68e0
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/20220724/2d5ea471/attachment-0001.htm>