Christoph Berg pushed to branch experimental at Debian GIS Project / postgis
Commits: 70c5ef2c by Christoph Berg at 2018-07-16T16:48:28+02:00 rules: Move "nocheck" evaluation into override_dh_auto_test - - - - - b06a0ce7 by Christoph Berg at 2018-07-16T16:51:48+02:00 debian/rules: Import architecture from /usr/share/dpkg/architecture.mk. - - - - - e0df7b50 by Christoph Berg at 2018-07-16T16:59:08+02:00 Re-enable tests on Ubuntu. - - - - - bdcf1bf8 by Christoph Berg at 2018-07-16T17:07:53+02:00 debian/rules: Ignore test failures instead of disabling tests completely on specific architectures - - - - - 2 changed files: - debian/changelog - debian/rules Changes: ===================================== debian/changelog ===================================== --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,10 @@ postgis (2.5.0~beta1+dfsg-1~exp2) UNRELEASED; urgency=medium * debian/pgversions: Bump to 9.4+, 9.3 is no longer supported. * Bump required GEOS version to 3.5. * Work around failure in building the postgis_tiger_geocoder extension. - * debian/rules: Use filter instead of findstring to disable tests on - specific architectures; explicitly disable tests on i386. + * debian/rules: Ignore test failures instead of disabling tests completely + on specific architectures; ignore tests on i386. + * debian/rules: Import architecture from /usr/share/dpkg/architecture.mk. + * Re-enable tests on Ubuntu. -- Bas Couwenberg <[email protected]> Thu, 05 Jul 2018 10:52:41 +0200 ===================================== debian/rules ===================================== --- a/debian/rules +++ b/debian/rules @@ -20,6 +20,7 @@ ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes) endif endif +include /usr/share/dpkg/architecture.mk include /usr/share/dpkg/pkg-info.mk # Magic to automatically create a debian/control file for the (or all) @@ -41,25 +42,10 @@ debian/control: debian/control.in debian/pgversions done; \ mv [email protected]_tmp $@) || (rm -f [email protected]_tmp; exit 1) -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) - -CHECK = check -ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) - CHECK = -endif - -# Skip tests on problematic architectures +CHECK_FAIL = exit 2 +# Ignore test failure on problematic architectures ifneq (,$(filter $(DEB_BUILD_ARCH),"arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x alpha hppa hurd-i386 kfreebsd-i386 powerpc ppc64 sparc64")) - CHECK = -endif - -# Disable tests on Ubuntu (and derivatives), hanging on their buildds. -ifeq ($(VENDOR_DERIVES_FROM_UBUNTU),yes) - CHECK = + CHECK = exit 0 endif # Upstream version (including ~rcN) for symbols version @@ -200,11 +186,12 @@ override_dh_auto_build-indep: build-arch-stamp $(MAKE) $(NJOBS) -C extensions override_dh_auto_test: +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) # Run unit tests (against the newest Postgres version, first) echo "LD_PRELOAD = '$(CURDIR)/liblwgeom/.libs/liblwgeom-$(MAJOR_VERSION).$(MINOR_VERSION).so.$(LIBLWGEOM_SOVERSION)'" \ > $(CURDIR)/postgis-check-env.tmp (set -e; \ - test -z '$(CHECK)' || \ + echo " ### testing $(NEWEST_POSTGRES_VERSION) ###"; \ pg_virtualenv -v $(NEWEST_POSTGRES_VERSION) \ -c '--environment $(CURDIR)/postgis-check-env.tmp' make check || (\ for LOGFILE in /tmp/pgis_reg/test_*_diff; do \ @@ -212,15 +199,15 @@ override_dh_auto_test: cat $$LOGFILE; \ done; \ echo " ### end of log dumps ###"; \ - exit 2) \ + $(CHECK_FAIL)) \ ) # Test against all other Postgres versions (set -e; \ for PGVER in $(OTHER_POSTGRES_VERSIONS); do \ + echo " ### testing $$PGVER ###"; \ echo "LD_PRELOAD = '$(CURDIR)/debian/build-$$PGVER/liblwgeom/.libs/liblwgeom-$(MAJOR_VERSION).$(MINOR_VERSION).so.$(LIBLWGEOM_SOVERSION)'" \ > $(CURDIR)/postgis-check-env.tmp; \ - test -z '$(CHECK)' || \ pg_virtualenv -v $$PGVER \ -c '--environment $(CURDIR)/postgis-check-env.tmp' \ make -C $(CURDIR)/debian/build-$$PGVER check || (\ @@ -229,8 +216,9 @@ override_dh_auto_test: cat $$LOGFILE; \ done; \ echo " ### end of log dumps ###"; \ - exit 2) \ + $(CHECK_FAIL)) \ done) +endif override_dh_auto_install-indep: # Install the most recent Postgres version. Note that we used to View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/compare/d4047fcc9504b5a3926629ed92620e3714ce7b6c...bdcf1bf8508da4b4cc17c4c97c077de95f3c3f47 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/compare/d4047fcc9504b5a3926629ed92620e3714ce7b6c...bdcf1bf8508da4b4cc17c4c97c077de95f3c3f47 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
