From: Rob Browning <rlb@defaultvalue.org>
Date: Sun, 29 Jul 2018 19:22:08 +0000 (-0500)
Subject: Disable the eieio-test-37-obsolete-name-in-constructor test
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~198
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8443485806e2812e21f7223c919173128e728242;p=emacs.git

Disable the eieio-test-37-obsolete-name-in-constructor test

Its behavior is unpredictable, and it was causing some buildd builds
to fail (cf. https://debbugs.gnu.org/24503).

Add 0013-Disable-eieio-test-37-obsolete-name-in-constructor.patch to
fix the problem, and thanks to Aaron M. Ucko for reporting it, and
J. Smith for tracking down the upstream issue.

Closes: 879020
---

8443485806e2812e21f7223c919173128e728242
diff --cc debian/.git-dpm
index 62ab1c9548e,00000000000..e412ed54519
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- e5a30a67a75250547d0676f9f9ede7eff57065a2
- e5a30a67a75250547d0676f9f9ede7eff57065a2
++21c38e366f7bc1497b4bd113e4f8564ef6ccbc17
++21c38e366f7bc1497b4bd113e4f8564ef6ccbc17
 +09a20fd582947ca08f0e80bc5353ae8abfe1e5ed
 +09a20fd582947ca08f0e80bc5353ae8abfe1e5ed
 +emacs_25.2+1.orig.tar.xz
 +ad6c8e3147a990ee49a3e68196751b9f1763919c
 +23186732
diff --cc debian/patches/0013-Disable-eieio-test-37-obsolete-name-in-constructor.patch
index 00000000000,00000000000..518c7bd4e17
new file mode 100644
--- /dev/null
+++ b/debian/patches/0013-Disable-eieio-test-37-obsolete-name-in-constructor.patch
@@@ -1,0 -1,0 +1,31 @@@
++From 21c38e366f7bc1497b4bd113e4f8564ef6ccbc17 Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Sun, 29 Jul 2018 14:18:23 -0500
++Subject: Disable eieio-test-37-obsolete-name-in-constructor
++
++The eieio-test-37-obsolete-name-in-constructor test has been disabled.
++
++Its behavior is currently unpredictable.
++
++Bug: https://debbugs.gnu.org/24503
++Bug-Debian: http://bugs.debian.org/879020
++Forwarded: not-needed
++---
++ test/automated/eieio-tests.el | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/test/automated/eieio-tests.el b/test/automated/eieio-tests.el
++index 994e987b703..650e7696612 100644
++--- a/test/automated/eieio-tests.el
+++++ b/test/automated/eieio-tests.el
++@@ -892,8 +892,8 @@ eieio--testing
++ (defmethod constructor :static ((_x eieio--testing) newname &rest _args)
++   (list newname 2))
++ 
++-(ert-deftest eieio-test-37-obsolete-name-in-constructor ()
++-  (should (equal (eieio--testing "toto") '("toto" 2))))
+++;; (ert-deftest eieio-test-37-obsolete-name-in-constructor ()
+++;;   (should (equal (eieio--testing "toto") '("toto" 2))))
++ 
++ (provide 'eieio-tests)
++ 
diff --cc debian/patches/series
index 7955dddde25,00000000000..9868d6b6979
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,12 -1,0 +1,13 @@@
 +0001-Prefer-usr-share-info-emacs.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
 +0012-A-remote-execution-exploit-via-enriched-text-has-bee.patch
++0013-Disable-eieio-test-37-obsolete-name-in-constructor.patch