summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2017-05-19 14:36:43 +0300
committerEli Zaretskii <eliz@gnu.org>2017-05-19 14:36:43 +0300
commit4b04d8a7d550b9d4a0e83334c80b97d6e8a60ca2 (patch)
tree85e43b998d6f6ae0abd0be14dfa91e1b5d8404ac
parentb43c4616ccc9cbaf7bc1531d0e6a4a84227f339e (diff)
parent45944e0183af5b6a2e31248a815fb061f9757eed (diff)
downloademacs-4b04d8a7d550b9d4a0e83334c80b97d6e8a60ca2.tar.gz
emacs-4b04d8a7d550b9d4a0e83334c80b97d6e8a60ca2.tar.bz2
emacs-4b04d8a7d550b9d4a0e83334c80b97d6e8a60ca2.zip
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
-rw-r--r--test/src/emacs-module-tests.el12
1 files changed, 5 insertions, 7 deletions
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)))))))
;;