From: Philipp Stephani <phst@google.com>
Date: Fri, 19 May 2017 11:26:29 +0000 (+0200)
Subject: Fix module tests on some systems
X-Git-Tag: emacs-26.0.90~521^2~359^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=45944e0183af5b6a2e31248a815fb061f9757eed;p=emacs.git

Fix module tests on some systems

If dladdr(3) isn't available or didn't work, the printed
representation of a module function will not include the file name,
but only the address.  Make the tests pass in that case.

* test/src/emacs-module-tests.el (module-function-object): Fix match for
module function printed representation
---

diff --git a/test/src/emacs-module-tests.el b/test/src/emacs-module-tests.el
index eb7c82b2f60..0f4bfae00a2 100644
--- a/test/src/emacs-module-tests.el
+++ b/test/src/emacs-module-tests.el
@@ -78,13 +78,11 @@ changes."
       (let ((obj (nth 2 body)))
         (should (equal (type-of obj) 'module-function))
         (should (string-match-p
-                 (rx (or "#<module function Fmod_test_sum from "
-                         ;; MS-Windows doesn't allow us to get the
-                         ;; function name, only the address.
-                         (and "#<module function at 0x"
-                              (one-or-more hex-digit)
-                              " from "))
-                     (* nonl) "mod-test" (* nonl) ">")
+                 (rx "#<module function "
+                     (or "Fmod_test_sum"
+                         (and "at 0x" (+ hex-digit)))
+                     (? " from " (* nonl) "mod-test" (* nonl) )
+                     ">")
                  (prin1-to-string obj)))))))
 
 ;;