[Git][debian-gis-team/postgis][experimental] Use make check RUNTESTFLAGS="-v" instead of cat'ing the failed results from /tmp.

[Christoph Berg]

Christoph Berg pushed to branch experimental at Debian GIS Project / postgis


Commits:
7ceff126 by Christoph Berg at 2018-07-28T12:34:03Z
Use make check RUNTESTFLAGS="-v" instead of cat'ing the failed results from /tmp.

This shows the failures inline which is much easier to read. Suggested by
Darafei Praliaskouski, thanks!

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ postgis (2.5.0~beta1+dfsg-1~exp3) UNRELEASED; urgency=medium
 
   [ Christoph Berg ]
   * Re-enable tests on i386, fixed upstream.
+  * Use make check RUNTESTFLAGS="-v" instead of cat'ing the failed results
+    from /tmp. Suggested by Darafei Praliaskouski, thanks!
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 17 Jul 2018 08:32:22 +0200
 


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -196,34 +196,21 @@ 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; \
-		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 \
-			echo " ### $$LOGFILE ###"; \
-			cat $$LOGFILE; \
-		done; \
-		echo " ### end of log dumps ###"; \
-		$(CHECK_FAIL)) \
-	)
+	echo " ### testing $(NEWEST_POSTGRES_VERSION) ###"
+	pg_virtualenv -v $(NEWEST_POSTGRES_VERSION) \
+		-c '--environment $(CURDIR)/postgis-check-env.tmp' \
+		make check RUNTESTFLAGS="-v" || $(CHECK_FAIL)
 
 #	Test against all other Postgres versions
-	(set -e; \
+	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; \
 		pg_virtualenv -v $$PGVER \
 			-c '--environment $(CURDIR)/postgis-check-env.tmp' \
-			make -C $(CURDIR)/debian/build-$$PGVER check || (\
-		for LOGFILE in /tmp/pgis_reg/test_*_diff; do \
-			echo " ### $$LOGFILE ###"; \
-			cat $$LOGFILE; \
-		done; \
-		echo " ### end of log dumps ###"; \
-		$(CHECK_FAIL)) \
-	done)
+			make -C $(CURDIR)/debian/build-$$PGVER check RUNTESTFLAGS="-v" || $(CHECK_FAIL); \
+	done
 endif
 
 override_dh_auto_install-indep:



View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/commit/7ceff1261340524e2b9be728be863b2861414727

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/commit/7ceff1261340524e2b9be728be863b2861414727
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/20180728/dcf7287f/attachment-0001.html>