[polybori] 01/01: Fix tests on ia64, try a fix for hurd.

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository polybori.

commit 7c61889e51110c7b4478b5633a47ce589b18c09f
Author: Tobias Hansen <tobias.han at gmx.de>
Date:   Mon Nov 4 22:51:44 2013 +0100

    Fix tests on ia64, try a fix for hurd.
---
 debian/changelog                                               |    8 ++++++++
 .../0003-Protect-CErrorInfo-from-invalid-array-access.patch    |    2 +-
 debian/rules                                                   |    7 ++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d3bb034..5a814ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+polybori (0.8.3-3) unstable; urgency=low
+
+  * Tests still failed on ia64, fix it for real.
+  * Try a workaround for failing testsuite on hurd due to
+    problems with rpath.
+
+ -- Tobias Hansen <thansen at debian.org>  Mon, 04 Nov 2013 22:49:54 +0100
+
 polybori (0.8.3-2) unstable; urgency=low
 
   * Protect CErrorInfo::text() against invalid array access.
diff --git a/debian/patches/0003-Protect-CErrorInfo-from-invalid-array-access.patch b/debian/patches/0003-Protect-CErrorInfo-from-invalid-array-access.patch
index d5620e7..5bf3103 100644
--- a/debian/patches/0003-Protect-CErrorInfo-from-invalid-array-access.patch
+++ b/debian/patches/0003-Protect-CErrorInfo-from-invalid-array-access.patch
@@ -10,7 +10,7 @@ Author: Tobias Hansen <thansen at debian.org>
  
    PBORI_TRACE_FUNC( "CErrorInfo::text(errornum_type) const" );
 -  if PBORI_UNLIKELY(num > CTypes::last_error)
-+  if PBORI_UNLIKELY(num < 0 || num > CTypes::last_error)
++  if PBORI_UNLIKELY(num < 0 || num >= CTypes::last_error)
      return "Unknown error occured.";
  
    return pErrorText[num];
diff --git a/debian/rules b/debian/rules
index e4958f9..4a616cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 PYVERS=$(shell pyversions -vr)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 NUMJOBS=$(filter parallel=%,$(DEB_BUILD_OPTIONS))
 SCONSPARFLAGS=$(subst parallel=,-j, $(NUMJOBS))
 DESTDIR=debian/tmp/
@@ -43,8 +44,12 @@ override_dh_auto_install-indep:
 
 
 test-unittests:
-	scons $(SCONSPARFLAGS) testsuite/unittests 
+	scons $(SCONSPARFLAGS) testsuite/unittests
+ifeq ($(DEB_HOST_ARCH_OS),hurd) # problems with rpath on hurd
+	LD_LIBRARY_PATH=$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) testsuite/unittests
+else
 	testsuite/unittests
+endif
 
 test-python%:
 	python$* ipbori/ipbori -t 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/polybori.git