[Pkg-openldap-devel] [openldap] 01/03: Disable test060-mt-hot on ppc64el (#866122)

[Ryan Tandy]

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

rtandy-guest pushed a commit to branch master
in repository openldap.

commit 2dd3e6866e11f45aab54fb313062c353bd0a92e5
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Sun Jul 16 10:32:25 2017 -0700

    Disable test060-mt-hot on ppc64el (#866122)
---
 debian/changelog | 7 +++++++
 debian/rules     | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7a82560..dbae86b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openldap (2.4.44+dfsg-8) UNRELEASED; urgency=medium
+
+  * Disable test060-mt-hot on ppc64el temporarily to avoid failing tests until 
+    the underlying kernel bug #866122 is fixed.
+
+ -- Ryan Tandy <ryan at nardis.ca>  Sun, 16 Jul 2017 10:30:15 -0700
+
 openldap (2.4.44+dfsg-7) unstable; urgency=medium
 
   * Relax the dependency of libldap-2.4-2 on libldap-common to also permit 
diff --git a/debian/rules b/debian/rules
index 3d27741..9c0c7fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,7 @@ export RESOLV_MULTI = off
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 CONFIG		= $(shell grep -v "^\#" debian/configure.options)
 ifeq ($(DEB_HOST_ARCH_OS),hurd)
@@ -108,6 +109,13 @@ ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
 	$(MAKE) -C contrib/slapd-modules/passwd/sha2 CC=$(CC)
 endif
 
+override_dh_auto_test:
+ifeq ($(DEB_HOST_ARCH),ppc64el)
+	# Disable test060-mt-host on ppc64el until #866122 is fixed.
+	rm -f tests/scripts/test060-mt-hot
+endif
+	dh_auto_test
+
 override_dh_auto_install:
 	dh_auto_install -- $(MAKEVARS)
 ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)

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