[Git][debian-gis-team/proj][experimental] 6 commits: Don't ignore test failures for arm64, ppc64el, s390x & ppc64.
Bas Couwenberg
gitlab at salsa.debian.org
Sun Feb 25 19:51:16 UTC 2018
Bas Couwenberg pushed to branch experimental at Debian GIS Project / proj
Commits:
a33d4f7f by Bas Couwenberg at 2018-02-24T17:35:27+01:00
Don't ignore test failures for arm64, ppc64el, s390x & ppc64.
- - - - -
e1d6814b by Bas Couwenberg at 2018-02-25T20:38:19+01:00
New upstream version 5.0.0~rc6
- - - - -
f5a5cfab by Bas Couwenberg at 2018-02-25T20:38:24+01:00
Merge tag 'upstream/5.0.0_rc6' into experimental
Upstream version 5.0.0~rc6
- - - - -
c425f88d by Bas Couwenberg at 2018-02-25T20:38:41+01:00
New upstream release candidate.
- - - - -
8b1362fd by Bas Couwenberg at 2018-02-25T20:39:11+01:00
Drop patches, included upstream.
- - - - -
7d2d2458 by Bas Couwenberg at 2018-02-25T20:40:17+01:00
Set distribution to experimental.
- - - - -
7 changed files:
- debian/changelog
- − debian/patches/Dont-reset-errno-when-skipping-tests.patch
- − debian/patches/Relax-some-the-tests-in-geodtest.patch
- − debian/patches/series
- debian/rules
- src/geodtest.c
- src/gie.c
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+proj (5.0.0~rc6-1~exp1) experimental; urgency=medium
+
+ * New upstream release candidate.
+ * Don't ignore test failures for arm64, ppc64el, s390x & ppc64.
+ * Drop patches, included upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 25 Feb 2018 20:39:55 +0100
+
proj (5.0.0~rc5-1~exp2) experimental; urgency=medium
* Add patch by Charles Karney to relax some of the tests in geodtest.
=====================================
debian/patches/Dont-reset-errno-when-skipping-tests.patch deleted
=====================================
--- a/debian/patches/Dont-reset-errno-when-skipping-tests.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Don't reset errno when skipping tests.
- The error number should not be reset until a new instance of "operation
- ..." is reached. The ignore-feature initially worked by accident since
- pj_errno was not being reset when calling proj_errno_reset. This was
- fixed in #808, which subsequently caused ignored tests to fail.
-Author: Kristian Evers <kristianevers at gmail.com>
-Origin: https://github.com/OSGeo/proj.4/pull/820/commits/ad4b6e12f137817217058f60c36ad51a4d29e417
-Bug: https://github.com/OSGeo/proj.4/issues/819
-
---- a/src/gie.c
-+++ b/src/gie.c
-@@ -332,7 +332,6 @@ static int another_failure (void) {
- static int another_skip (void) {
- T.op_skip++;
- T.total_skip++;
-- proj_errno_reset (T.P);
- return 0;
- }
-
=====================================
debian/patches/Relax-some-the-tests-in-geodtest.patch deleted
=====================================
--- a/debian/patches/Relax-some-the-tests-in-geodtest.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-Description: Relax some the tests in geodtest.
- This attempts to address the geodtest failures noted in #819.
-Author: Charles Karney <charles at karney.com>
-Origin: https://github.com/cffk/proj.4/commit/7ff60ee494b225f3988648c64bd70f6ae4176257
-
---- a/src/geodtest.c
-+++ b/src/geodtest.c
-@@ -698,35 +698,35 @@ static int GeodSolve80() {
- int result = 0;
- geod_init(&g, wgs84_a, wgs84_f);
- geod_geninverse(&g, 0, 0, 0, 90, 0, 0, 0, 0, &M12, &M21, 0);
-- result += assertEquals(M12, -0.0052842753, 0.5e-10);
-- result += assertEquals(M21, -0.0052842753, 0.5e-10);
-+ result += assertEquals(M12, -0.00528427534, 0.5e-10);
-+ result += assertEquals(M21, -0.00528427534, 0.5e-10);
- geod_geninverse(&g, 0, 0, 1e-6, 1e-6, 0, 0, 0, 0, &M12, &M21, 0);
- result += assertEquals(M12, 1, 0.5e-10);
- result += assertEquals(M21, 1, 0.5e-10);
- a12 = geod_geninverse(&g, 20.001, 0, 20.001, 0,
- &s12, &azi1, &azi2, &m12, &M12, &M21, &S12);
-- result += a12 == 0 ? 0 : 1;
-- result += s12 == 0 ? 0 : 1;
-- result += azi1 == 180 ? 0 : 1;
-- result += azi2 == 180 ? 0 : 1;
-- result += m12 == 0 ? 0 : 1;
-+ result += assertEquals(a12, 0, 1e-13);
-+ result += assertEquals(s12, 0, 1e-8);
-+ result += assertEquals(azi1, 180, 1e-13);
-+ result += assertEquals(azi2, 180, 1e-13);
-+ result += assertEquals(m12, 0, 1e-8);
- result += assertEquals(M12, 1, 1e-15);
- result += assertEquals(M21, 1, 1e-15);
-- result += S12 == 0 ? 0 : 1;
-+ result += assertEquals(S12, 0, 1e-10);
- a12 = geod_geninverse(&g, 90, 0, 90, 180,
- &s12, &azi1, &azi2, &m12, &M12, &M21, &S12);
-- result += a12 == 0 ? 0 : 1;
-- result += s12 == 0 ? 0 : 1;
-- result += azi1 == 0 ? 0 : 1;
-- result += azi2 == 180 ? 0 : 1;
-- result += m12 == 0 ? 0 : 1;
-+ result += assertEquals(a12, 0, 1e-13);
-+ result += assertEquals(s12, 0, 1e-8);
-+ result += assertEquals(azi1, 0, 1e-13);
-+ result += assertEquals(azi2, 180, 1e-13);
-+ result += assertEquals(m12, 0, 1e-8);
- result += assertEquals(M12, 1, 1e-15);
- result += assertEquals(M21, 1, 1e-15);
- result += assertEquals(S12, 127516405431022, 0.5);
- /* An incapable line which can't take distance as input */
- geod_lineinit(&l, &g, 1, 2, 90, GEOD_LATITUDE);
- a12 = geod_genposition(&l, 0, 1000, 0, 0, 0, 0, 0, 0, 0, 0);
-- result += a12 != a12 ? 0 : 1;
-+ result += a12 == a12 ? 1 : 0;
- return result;
- }
-
-@@ -890,8 +890,8 @@ static int Planimeter19() {
- result += area == 0 ? 0 : 1;
- result += perim == 0 ? 0 : 1;
- geod_polygon_testedge(&g, &p, 90, 1000, 0, 1, &area, &perim);
-- result += area != area ? 0 : 1;
-- result += perim != perim ? 0 : 1;
-+ result += area == area ? 1 : 0;
-+ result += perim == perim ? 1 : 0;
- geod_polygon_addpoint(&g, &p, 1, 1);
- geod_polygon_compute(&g, &p, 0, 1, &area, &perim);
- result += area == 0 ? 0 : 1;
-@@ -902,7 +902,7 @@ static int Planimeter19() {
- geod_polygon_testpoint(&g, &p, 1, 1, 0, 1, 0, &perim);
- result += perim == 0 ? 0 : 1;
- geod_polygon_testedge(&g, &p, 90, 1000, 0, 1, 0, &perim);
-- result += perim != perim ? 0 : 1;
-+ result += perim == perim ? 1 : 0;
- geod_polygon_addpoint(&g, &p, 1, 1);
- geod_polygon_compute(&g, &p, 0, 1, 0, &perim);
- result += perim == 0 ? 0 : 1;
-@@ -991,8 +991,8 @@ static int EmptyPoly() {
- result += area == 0 ? 0 : 1;
- result += perim == 0 ? 0 : 1;
- geod_polygon_testedge(&g, &p, 90, 1000, 0, 1, &area, &perim);
-- result += area != area ? 0 : 1;
-- result += perim != perim ? 0 : 1;
-+ result += area == area ? 1 : 0;
-+ result += perim == perim ? 1 : 0;
- geod_polygon_compute(&g, &p, 0, 1, &area, &perim);
- result += area == 0 ? 0 : 1;
- result += perim == 0 ? 0 : 1;
-@@ -1000,7 +1000,7 @@ static int EmptyPoly() {
- geod_polygon_testpoint(&g, &p, 1, 1, 0, 1, 0, &perim);
- result += perim == 0 ? 0 : 1;
- geod_polygon_testedge(&g, &p, 90, 1000, 0, 1, 0, &perim);
-- result += perim != perim ? 0 : 1;
-+ result += perim == perim ? 1 : 0;
- geod_polygon_compute(&g, &p, 0, 1, 0, &perim);
- result += perim == 0 ? 0 : 1;
- geod_polygon_addpoint(&g, &p, 1, 1);
=====================================
debian/patches/series deleted
=====================================
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-Dont-reset-errno-when-skipping-tests.patch
-Relax-some-the-tests-in-geodtest.patch
=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -58,7 +58,7 @@ override_dh_auto_build:
override_dh_auto_test:
# Ignore test failures on problematic architectures only
-ifneq (,$(findstring $(DEB_BUILD_ARCH),"arm64 i386 ppc64el s390x hurd-i386 ia64 powerpc ppc64"))
+ifneq (,$(findstring $(DEB_BUILD_ARCH),"i386 hurd-i386 ia64 powerpc"))
dh_auto_test || echo "Ignoring test failures"
else
dh_auto_test
=====================================
src/geodtest.c
=====================================
--- a/src/geodtest.c
+++ b/src/geodtest.c
@@ -698,35 +698,35 @@ static int GeodSolve80() {
int result = 0;
geod_init(&g, wgs84_a, wgs84_f);
geod_geninverse(&g, 0, 0, 0, 90, 0, 0, 0, 0, &M12, &M21, 0);
- result += assertEquals(M12, -0.0052842753, 0.5e-10);
- result += assertEquals(M21, -0.0052842753, 0.5e-10);
+ result += assertEquals(M12, -0.00528427534, 0.5e-10);
+ result += assertEquals(M21, -0.00528427534, 0.5e-10);
geod_geninverse(&g, 0, 0, 1e-6, 1e-6, 0, 0, 0, 0, &M12, &M21, 0);
result += assertEquals(M12, 1, 0.5e-10);
result += assertEquals(M21, 1, 0.5e-10);
a12 = geod_geninverse(&g, 20.001, 0, 20.001, 0,
&s12, &azi1, &azi2, &m12, &M12, &M21, &S12);
- result += a12 == 0 ? 0 : 1;
- result += s12 == 0 ? 0 : 1;
- result += azi1 == 180 ? 0 : 1;
- result += azi2 == 180 ? 0 : 1;
- result += m12 == 0 ? 0 : 1;
+ result += assertEquals(a12, 0, 1e-13);
+ result += assertEquals(s12, 0, 1e-8);
+ result += assertEquals(azi1, 180, 1e-13);
+ result += assertEquals(azi2, 180, 1e-13);
+ result += assertEquals(m12, 0, 1e-8);
result += assertEquals(M12, 1, 1e-15);
result += assertEquals(M21, 1, 1e-15);
- result += S12 == 0 ? 0 : 1;
+ result += assertEquals(S12, 0, 1e-10);
a12 = geod_geninverse(&g, 90, 0, 90, 180,
&s12, &azi1, &azi2, &m12, &M12, &M21, &S12);
- result += a12 == 0 ? 0 : 1;
- result += s12 == 0 ? 0 : 1;
- result += azi1 == 0 ? 0 : 1;
- result += azi2 == 180 ? 0 : 1;
- result += m12 == 0 ? 0 : 1;
+ result += assertEquals(a12, 0, 1e-13);
+ result += assertEquals(s12, 0, 1e-8);
+ result += assertEquals(azi1, 0, 1e-13);
+ result += assertEquals(azi2, 180, 1e-13);
+ result += assertEquals(m12, 0, 1e-8);
result += assertEquals(M12, 1, 1e-15);
result += assertEquals(M21, 1, 1e-15);
result += assertEquals(S12, 127516405431022, 0.5);
/* An incapable line which can't take distance as input */
geod_lineinit(&l, &g, 1, 2, 90, GEOD_LATITUDE);
a12 = geod_genposition(&l, 0, 1000, 0, 0, 0, 0, 0, 0, 0, 0);
- result += a12 != a12 ? 0 : 1;
+ result += a12 == a12 ? 1 : 0;
return result;
}
@@ -890,8 +890,8 @@ static int Planimeter19() {
result += area == 0 ? 0 : 1;
result += perim == 0 ? 0 : 1;
geod_polygon_testedge(&g, &p, 90, 1000, 0, 1, &area, &perim);
- result += area != area ? 0 : 1;
- result += perim != perim ? 0 : 1;
+ result += area == area ? 1 : 0;
+ result += perim == perim ? 1 : 0;
geod_polygon_addpoint(&g, &p, 1, 1);
geod_polygon_compute(&g, &p, 0, 1, &area, &perim);
result += area == 0 ? 0 : 1;
@@ -902,7 +902,7 @@ static int Planimeter19() {
geod_polygon_testpoint(&g, &p, 1, 1, 0, 1, 0, &perim);
result += perim == 0 ? 0 : 1;
geod_polygon_testedge(&g, &p, 90, 1000, 0, 1, 0, &perim);
- result += perim != perim ? 0 : 1;
+ result += perim == perim ? 1 : 0;
geod_polygon_addpoint(&g, &p, 1, 1);
geod_polygon_compute(&g, &p, 0, 1, 0, &perim);
result += perim == 0 ? 0 : 1;
@@ -991,8 +991,8 @@ static int EmptyPoly() {
result += area == 0 ? 0 : 1;
result += perim == 0 ? 0 : 1;
geod_polygon_testedge(&g, &p, 90, 1000, 0, 1, &area, &perim);
- result += area != area ? 0 : 1;
- result += perim != perim ? 0 : 1;
+ result += area == area ? 1 : 0;
+ result += perim == perim ? 1 : 0;
geod_polygon_compute(&g, &p, 0, 1, &area, &perim);
result += area == 0 ? 0 : 1;
result += perim == 0 ? 0 : 1;
@@ -1000,7 +1000,7 @@ static int EmptyPoly() {
geod_polygon_testpoint(&g, &p, 1, 1, 0, 1, 0, &perim);
result += perim == 0 ? 0 : 1;
geod_polygon_testedge(&g, &p, 90, 1000, 0, 1, 0, &perim);
- result += perim != perim ? 0 : 1;
+ result += perim == perim ? 1 : 0;
geod_polygon_compute(&g, &p, 0, 1, 0, &perim);
result += perim == 0 ? 0 : 1;
geod_polygon_addpoint(&g, &p, 1, 1);
=====================================
src/gie.c
=====================================
--- a/src/gie.c
+++ b/src/gie.c
@@ -332,7 +332,6 @@ static int another_failure (void) {
static int another_skip (void) {
T.op_skip++;
T.total_skip++;
- proj_errno_reset (T.P);
return 0;
}
View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/compare/9a0c0dd9f440240f846ef2638c1b84c43263b9c5...7d2d2458bb8deba55ea8502c551347b9246a8374
---
View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/compare/9a0c0dd9f440240f846ef2638c1b84c43263b9c5...7d2d2458bb8deba55ea8502c551347b9246a8374
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180225/50513637/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list