diff options
| author | Michael Albinus <michael.albinus@gmx.de> | 2017-06-05 13:00:07 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2017-06-05 13:00:07 +0200 |
| commit | 9f496c591d457b511a42c0f63e0d2d923cda0247 (patch) | |
| tree | 86b550b9b3a8c1b5cb33bfdca82e470ab211bfac /test | |
| parent | 751d5920bed1a3af01fd5a31ce4eb7d8b6994151 (diff) | |
| parent | 13e9493ea36df04e2c6b69e9b316d40c072ee88b (diff) | |
| download | emacs-9f496c591d457b511a42c0f63e0d2d923cda0247.tar.gz | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.in | 2 | ||||
| -rw-r--r-- | test/src/emacs-module-tests.el | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index 4f12a8ea48c..7b8c967128f 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -182,7 +182,7 @@ test_module_dir := $(srcdir)/data/emacs-module test_module_name := mod-test@MODULES_SUFFIX@ test_module := $(test_module_dir)/$(test_module_name) $(srcdir)/src/emacs-module-tests.log: $(test_module) -$(test_module): $(srcdir)/../src/emacs-module.[ch] +$(test_module): $(srcdir)/../src/emacs-module.[ch] $(test_module_dir)/mod-test.c $(MAKE) -C $(test_module_dir) $(test_module_name) SO=@MODULES_SUFFIX@ endif diff --git a/test/src/emacs-module-tests.el b/test/src/emacs-module-tests.el index 5e78aebf7c3..622bbadb3ef 100644 --- a/test/src/emacs-module-tests.el +++ b/test/src/emacs-module-tests.el @@ -31,13 +31,13 @@ (should (= (mod-test-sum 1 2) 3)) (let ((descr (should-error (mod-test-sum 1 2 3)))) (should (eq (car descr) 'wrong-number-of-arguments)) - (should (stringp (nth 1 descr))) + (should (module-function-p (nth 1 descr))) (should (eq 0 (string-match (concat "#<module function " "\\(at \\(0x\\)?[0-9a-fA-F]+\\( from .*\\)?" "\\|Fmod_test_sum from .*\\)>") - (nth 1 descr)))) + (prin1-to-string (nth 1 descr))))) (should (= (nth 2 descr) 3))) (should-error (mod-test-sum "1" 2) :type 'wrong-type-argument) (should-error (mod-test-sum 1 "2") :type 'wrong-type-argument) |