[osmium] 01/02: use BOOST_TEST_CATCH_SYSTEM_ERRORS=no dh_auto_test to fix FTBFS on kFreeBSD.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository osmium.

commit 05dfb4713ecb10abe8db1f2825176f2e001d84ac
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Sep 9 22:15:40 2014 +0200

    use BOOST_TEST_CATCH_SYSTEM_ERRORS=no dh_auto_test to fix FTBFS on kFreeBSD.
    
    Set BOOST_TEST_CATCH_SYSTEM_ERRORS=no environment variable to fix the test
    failure on kFreeBSD where Boost catches the SIGCHLD signal when zcat and
    bzcat exit successfully but considers the signal a fatal error.
    
    See also: https://github.com/joto/osmium/issues/94
---
 debian/changelog |  8 ++++++++
 debian/rules     | 16 +++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e2d112b..811c3a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+osmium (0.0~20140825-3f3d229-2) UNRELEASED; urgency=medium
+
+  * Set BOOST_TEST_CATCH_SYSTEM_ERRORS=no environment variable to fix the test
+    failure on kFreeBSD where Boost catches the SIGCHLD signal when zcat and
+    bzcat exit successfully but considers the signal a fatal error.
+
+ -- Bas Couwenberg <sebastic at xs4all.nl>  Tue, 09 Sep 2014 22:10:35 +0200
+
 osmium (0.0~20140825-3f3d229-1) unstable; urgency=medium
 
   [ Andreas Tille ]
diff --git a/debian/rules b/debian/rules
index b416807..45679eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@
 
 CXXFLAGS += $(CPPFLAGS)
 
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+
 %:
 	dh $@
 
@@ -22,7 +24,19 @@ override_dh_auto_install:
 	dh_auto_install -Dosmjs
 
 override_dh_auto_test:
-	dh_auto_test
+ifneq (,$(findstring $(DEB_BUILD_ARCH),"kfreebsd-amd64 kfreebsd-i386"))
+	# The t/osmfile/test_read_and_write.cpp test fails on kFreeBSD because
+	# Boost considers an exiting child process a fatal error.
+	#
+	# To workaround this BOOST_TEST_CATCH_SYSTEM_ERRORS=no prohibits the
+	# Boost framework from catching asyncronous system events.
+	# 
+	# See also: https://github.com/joto/osmium/issues/94
+
+        BOOST_TEST_CATCH_SYSTEM_ERRORS=no dh_auto_test
+else
+        dh_auto_test
+endif
 
 override_dh_install:
 	dh_install --list-missing

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium.git