[osmium] 05/06: Don't set BOOST_TEST_CATCH_SYSTEM_ERRORS=no for dh_auto_test on kFreeBSD, the upstream run_tests.sh now sets this variable.

Bas Couwenberg sebastic at xs4all.nl
Wed Sep 10 08:52:37 UTC 2014


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

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

commit dc94213e59c71789d4090a295c917eb9f0a38e4b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Sep 10 10:37:00 2014 +0200

    Don't set BOOST_TEST_CATCH_SYSTEM_ERRORS=no for dh_auto_test on kFreeBSD, the upstream run_tests.sh now sets this variable.
---
 debian/changelog |  2 ++
 debian/rules     | 15 ---------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f629714..178c3b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 osmium (0.0~20140910-9a069af-1) UNRELEASED; urgency=medium
 
   * New upstream git snapshot.
+  * Don't set BOOST_TEST_CATCH_SYSTEM_ERRORS=no for dh_auto_test on kFreeBSD,
+    the upstream run_tests.sh now sets this variable.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Wed, 10 Sep 2014 10:32:04 +0200
 
diff --git a/debian/rules b/debian/rules
index fb67b85..db84138 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,21 +23,6 @@ override_dh_auto_install:
 	dh_auto_install
 	dh_auto_install -Dosmjs
 
-override_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



More information about the Pkg-grass-devel mailing list