[Git][debian-gis-team/hdf4][experimental] 2 commits: Ignore test failures on ppc64el.

[Bas Couwenberg (@sebastic)]

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


Commits:
54bc6fe6 by Bas Couwenberg at 2023-03-08T21:19:56+01:00
Ignore test failures on ppc64el.

- - - - -
44cc3851 by Bas Couwenberg at 2023-03-08T21:22:21+01:00
Don't hardcode RELEASE in rules.

- - - - -


3 changed files:

- debian/autoreconf
- debian/changelog
- debian/rules


Changes:

=====================================
debian/autoreconf
=====================================
@@ -1,2 +1,2 @@
-HDF4.2.15
+HDF4.2.16
 HDF4_ALT


=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+libhdf4 (4.2.16-1~exp2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Ignore test failures on ppc64el.
+  * Don't hardcode RELEASE in rules.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 08 Mar 2023 21:18:22 +0100
+
 libhdf4 (4.2.16-1~exp1) experimental; urgency=medium
 
   * Team upload.


=====================================
debian/rules
=====================================
@@ -14,7 +14,7 @@ UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
 
 DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
-RELEASE := 4.2.15
+RELEASE := $(UPSTREAM_VERSION)
 PACKAGE := libhdf4
 SOVER   := 0
 
@@ -39,12 +39,6 @@ ifneq (,$(findstring verbose,$(DEB_BUILD_OPTIONS)))
    export DH_VERBOSE
 endif
 
-ifneq (,$(filter $(DEB_BUILD_ARCH),s390x sparc64))
-   DISABLE_TESTS=1
-else
-   DISABLE_TESTS=0
-endif
-
 TEMPLATES=$(wildcard debian/*.in)
 
 templates:
@@ -124,23 +118,37 @@ override_dh_auto_build:
 		                 LIBS="$(LIBS)"
 
 override_dh_auto_test:
-	if [ "$(DISABLE_TESTS)" = 0 ]; then \
-		dh_auto_test --sourcedirectory=HDF4 \
-		             --builddirectory=debian/build-hdf4 \
-		             --no-parallel \
-		             -- F77="$(F77)" CC="$(CC)" CXX="$(CXX)" \
-		                CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-		                LIBS="$(LIBS)" ; \
-	fi
-
-	if [ "$(DISABLE_TESTS)" = 0 ]; then \
-		dh_auto_test --sourcedirectory=HDF4_ALT \
-		             --builddirectory=debian/build-hdf4-alt \
-		             --no-parallel \
-		             -- CC="$(CC)" CXX="$(CXX)" \
-		                CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-		                LIBS="$(LIBS)" ; \
-	fi
+ifneq (,$(filter $(DEB_BUILD_ARCH),ppc64el s390x sparc64))
+	dh_auto_test --sourcedirectory=HDF4 \
+	             --builddirectory=debian/build-hdf4 \
+	             --no-parallel \
+	             -- F77="$(F77)" CC="$(CC)" CXX="$(CXX)" \
+	                CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+	                LIBS="$(LIBS)" \
+	             || echo "Ignoring test failures"
+
+	dh_auto_test --sourcedirectory=HDF4_ALT \
+	             --builddirectory=debian/build-hdf4-alt \
+	             --no-parallel \
+	             -- CC="$(CC)" CXX="$(CXX)" \
+	                CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+	                LIBS="$(LIBS)" \
+	             || echo "Ignoring test failures"
+else
+	dh_auto_test --sourcedirectory=HDF4 \
+	             --builddirectory=debian/build-hdf4 \
+	             --no-parallel \
+	             -- F77="$(F77)" CC="$(CC)" CXX="$(CXX)" \
+	                CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+	                LIBS="$(LIBS)"
+
+	dh_auto_test --sourcedirectory=HDF4_ALT \
+	             --builddirectory=debian/build-hdf4-alt \
+	             --no-parallel \
+	             -- CC="$(CC)" CXX="$(CXX)" \
+	                CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+	                LIBS="$(LIBS)"
+endif
 
 override_dh_auto_install:
 	dh_auto_install --sourcedirectory=HDF4 \



View it on GitLab: https://salsa.debian.org/debian-gis-team/hdf4/-/compare/6e9df09d14f9ab0d42b85f034af2d57829dc6899...44cc385111b6d941412fb0707b9043fb6adee8f7

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/hdf4/-/compare/6e9df09d14f9ab0d42b85f034af2d57829dc6899...44cc385111b6d941412fb0707b9043fb6adee8f7
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/20230308/221ccf36/attachment-0001.htm>