Don't downcase lookup paths in elisp-mode-tests
authorRob Browning <rlb@defaultvalue.org>
Sat, 29 Jul 2017 17:26:01 +0000 (12:26 -0500)
committerRob Browning <rlb@defaultvalue.org>
Sat, 29 Jul 2017 17:26:11 +0000 (12:26 -0500)
This caused the tests to fail under sbuild when the test path
contained uppercase characters.

Add 0010-Don-t-downcase-real-xref-in-elisp-mode-tests.patch to fix the
problem.

1  2 
debian/.git-dpm
debian/patches/0010-Don-t-downcase-real-xref-in-elisp-mode-tests.patch
debian/patches/series

diff --cc debian/.git-dpm
index 8cc1ea193cadd9e5f086f57f605dfe485f80323a,0000000000000000000000000000000000000000..840d87908d164db3f3af586250dbdaacb34f07c1
mode 100644,000000..100644
--- /dev/null
@@@ -1,8 -1,0 +1,8 @@@
- e0103758d20a59363b6a356e8d50d28cf25616b1
- e0103758d20a59363b6a356e8d50d28cf25616b1
 +# see git-dpm(1) from git-dpm package
++dfaa56fe12feedba0be460235a2309a93188509f
++dfaa56fe12feedba0be460235a2309a93188509f
 +09a20fd582947ca08f0e80bc5353ae8abfe1e5ed
 +09a20fd582947ca08f0e80bc5353ae8abfe1e5ed
 +emacs25_25.2+1.orig.tar.xz
 +655de53b3ee88f19a7c85005636fa8851a6f71b1
 +23189972
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..828e2661c31a39dfc1713900ef3818f7a4a95bee
new file mode 100644 (file)
--- /dev/null
--- /dev/null
@@@ -1,0 -1,0 +1,44 @@@
++From dfaa56fe12feedba0be460235a2309a93188509f Mon Sep 17 00:00:00 2001
++From: Rob Browning <rlb@defaultvalue.org>
++Date: Sat, 29 Jul 2017 11:50:27 -0500
++Subject: Don't downcase real xref in elisp-mode-tests
++
++The elisp-mode-tests should no longer fail on case sensitive
++filesystems when the build path contains uppercase characters.
++
++Previously the code was downcasing the path for both comparison and
++lookups.
++---
++ test/automated/elisp-mode-tests.el | 8 ++++++--
++ 1 file changed, 6 insertions(+), 2 deletions(-)
++
++diff --git a/test/automated/elisp-mode-tests.el b/test/automated/elisp-mode-tests.el
++index 605f9ca08df..805d9566e32 100644
++--- a/test/automated/elisp-mode-tests.el
+++++ b/test/automated/elisp-mode-tests.el
++@@ -179,11 +179,15 @@ xref-elisp-test-descr-to-target
++ (defun xref-elisp-test-run (xrefs expected-xrefs)
++   (should (= (length xrefs) (length expected-xrefs)))
++   (while xrefs
++-    (let* ((xref (pop xrefs))
+++    (let* ((real-xref (pop xrefs))
+++           (xref (clone real-xref))
++            (expected (pop expected-xrefs))
++            (expected-xref (or (when (consp expected) (car expected)) expected))
++            (expected-source (when (consp expected) (cdr expected))))
++ 
+++      (setf (oref xref location)
+++            (copy-xref-elisp-location (oref xref location)))
+++
++       ;; Downcase the filenames for case-insensitive file systems.
++       (setf (xref-elisp-location-file (oref xref location))
++             (downcase (xref-elisp-location-file (oref xref location))))
++@@ -193,7 +197,7 @@ xref-elisp-test-run
++ 
++       (should (equal xref expected-xref))
++ 
++-      (xref--goto-location (xref-item-location xref))
+++      (xref--goto-location (xref-item-location real-xref))
++       (back-to-indentation)
++       (should (looking-at (or expected-source
++                               (xref-elisp-test-descr-to-target expected)))))
index 4fc609b1aeefb3cbcfb50e6aafe4f99d73718e04,0000000000000000000000000000000000000000..63242c9030e163cec763128f4bde9090afaf2379
mode 100644,000000..100644
--- /dev/null
@@@ -1,9 -1,0 +1,10 @@@
 +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