Disable eieio-test-method-order-list-6

Its behavior is unpredictable, and it was causing the armhf build to
fail:

  https://debbugs.gnu.org/27878
  https://debbugs.gnu.org/24503#21

Add 0011-Disable-eieio-test-method-order-list-6.patch to fix the
problem.  Thanks to Glen Morris for pointing out the previous report.

diff --cc debian/.git-dpm
index 840d87908d164db3f3af586250dbdaacb34f07c1,0000000000000000000000000000000000000000..0756d5aad41bf8ce973a184e9600748e4102aa99
mode 100644,000000..100644
--- 1/debian/.git-dpm
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
- dfaa56fe12feedba0be460235a2309a93188509f
- dfaa56fe12feedba0be460235a2309a93188509f
 +# see git-dpm(1) from git-dpm package
++8900499027b692994a3b411954850c3672b9d2f6
++8900499027b692994a3b411954850c3672b9d2f6
 +09a20fd582947ca08f0e80bc5353ae8abfe1e5ed
 +09a20fd582947ca08f0e80bc5353ae8abfe1e5ed
 +emacs25_25.2+1.orig.tar.xz
 +655de53b3ee88f19a7c85005636fa8851a6f71b1
 +23189972

diff --cc debian/patches/0011-Disable-eieio-test-method-order-list-6.patch
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..d0b4ae3f0688e24150b670c1aa3b4a05fb02d278
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/debian/patches/0011-Disable-eieio-test-method-order-list-6.patch
@@@ -1,0 -1,0 +1,46 @@@
++From 8900499027b692994a3b411954850c3672b9d2f6 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Sun, 30 Jul 2017 21:43:10 -0500
++Subject: Disable eieio-test-method-order-list-6
++
++The eieio-test-method-order-list-6 test has been disabled
++
++Its behavior is currently unpredictable.
++
++Bug: https://debbugs.gnu.org/27878
++Bug: https://debbugs.gnu.org/cgi/24503#21
++---
++ test/automated/eieio-test-methodinvoke.el | 20 ++++++++++----------
++ 1 file changed, 10 insertions(+), 10 deletions(-)
++
++diff --git a/test/automated/eieio-test-methodinvoke.el b/test/automated/eieio-test-methodinvoke.el
++index 09edea461d1..ab3a4444ee0 100644
++--- a/test/automated/eieio-test-methodinvoke.el
+++++ b/test/automated/eieio-test-methodinvoke.el
++@@ -189,16 +189,16 @@ make-instance
++   (cl-call-next-method)
++   )
++ 
++-(ert-deftest eieio-test-method-order-list-6 ()
++-  (let ((eieio-test-method-order-list nil)
++-     (ans '(
++-            (:STATIC C)
++-            (:STATIC C-base1)
++-            (:STATIC C-base2)
++-            )))
++-    (C nil)
++-    (setq eieio-test-method-order-list (nreverse eieio-test-method-order-list))
++-    (eieio-test-match ans)))
+++;; (ert-deftest eieio-test-method-order-list-6 ()
+++;;   (let ((eieio-test-method-order-list nil)
+++;;   (ans '(
+++;;          (:STATIC C)
+++;;          (:STATIC C-base1)
+++;;          (:STATIC C-base2)
+++;;          )))
+++;;     (C nil)
+++;;     (setq eieio-test-method-order-list (nreverse eieio-test-method-order-list))
+++;;     (eieio-test-match ans)))
++ 
++ ;;; Diamond Test
++ ;;

diff --cc debian/patches/series
index 63242c9030e163cec763128f4bde9090afaf2379,0000000000000000000000000000000000000000..4894c8bdc4747f1e0d4b7995b223c8e06dfbd15e
mode 100644,000000..100644
--- 1/debian/patches/series
--- /dev/null
+++ b/debian/patches/series
@@@ -1,10 -1,0 +1,11 @@@
 +0001-Prefer-usr-share-info-emacs-MAJORVERSION.patch
 +0002-Run-debian-startup-and-set-debian-emacs-flavor.patch
 +0003-Remove-files-that-appear-to-be-incompatible-with-the.patch
 +0004-Adjust-documentation-references-for-Debian.patch
 +0005-Modify-the-output-of-version-to-indicate-Debian-modi.patch
 +0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch
 +0007-Kill-gpg-agent-in-package-test.el-to-avoid-a-race.patch
 +0008-Don-t-provide-openssl-s_client-as-an-option-for-ssl-.patch
 +0009-A-memory-alignment-problem-causing-m68k-failures-has.patch
 +0010-Don-t-downcase-real-xref-in-elisp-mode-tests.patch
++0011-Disable-eieio-test-method-order-list-6.patch