From: Glenn Morris <rgm@gnu.org>
Date: Wed, 31 May 2017 01:01:56 +0000 (-0400)
Subject: Avoid subr test failure when source dir has multiple names
X-Git-Tag: emacs-26.0.90~521^2~220
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=855b3e700fd1db62ae701a89bce4be5ed094352a;p=emacs.git

Avoid subr test failure when source dir has multiple names

* test/lisp/subr-tests.el (subr-tests--this-file):
Use the true name of the file.  The following test does a string
comparison of this value with that from method-files, which uses
load-history, which contains true names.
---

diff --git a/test/lisp/subr-tests.el b/test/lisp/subr-tests.el
index 8fa258d12ed..c0bfd40f806 100644
--- a/test/lisp/subr-tests.el
+++ b/test/lisp/subr-tests.el
@@ -298,7 +298,8 @@ cf. Bug#25477."
 (cl-defmethod subr-tests--generic ((x integer))
   (message "%s is a number" x))
 (cl-defgeneric subr-tests--generic-without-methods (x y))
-(defvar subr-tests--this-file (or load-file-name buffer-file-name))
+(defvar subr-tests--this-file
+  (file-truename (or load-file-name buffer-file-name)))
 
 (ert-deftest subr-tests--method-files--finds-methods ()
   "`method-files' returns a list of files and methods for a generic function."