diff options
| author | Andrea Corallo <akrl@sdf.org> | 2021-03-12 16:42:51 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2021-03-12 16:42:51 +0100 |
| commit | 82bd6d57d54d4cdb205d921c2476d1dbb17f4188 (patch) | |
| tree | fca7c47620f8d246015b85aab8dd91e440847743 /test/lisp/emacs-lisp | |
| parent | d9cd55a4f1c3f391b996dfbe77ed24306b37ac9f (diff) | |
| parent | a0854f939ce3a1de2c8cbc5e38b106a8df4480f6 (diff) | |
| download | emacs-82bd6d57d54d4cdb205d921c2476d1dbb17f4188.tar.gz emacs-82bd6d57d54d4cdb205d921c2476d1dbb17f4188.tar.bz2 emacs-82bd6d57d54d4cdb205d921c2476d1dbb17f4188.zip | |
Merge remote-tracking branch 'savannah/master' into native-comp
Diffstat (limited to 'test/lisp/emacs-lisp')
| -rw-r--r-- | test/lisp/emacs-lisp/bytecomp-tests.el | 5 | ||||
| -rw-r--r-- | test/lisp/emacs-lisp/ert-tests.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/test/lisp/emacs-lisp/bytecomp-tests.el b/test/lisp/emacs-lisp/bytecomp-tests.el index 03c267ccd0f..5147cd26883 100644 --- a/test/lisp/emacs-lisp/bytecomp-tests.el +++ b/test/lisp/emacs-lisp/bytecomp-tests.el @@ -1222,6 +1222,11 @@ compiled correctly." (byte-compile 'counter) (should (equal (counter) 1)))))) +(ert-deftest bytecomp-string-vs-docstring () + ;; Don't confuse a string return value for a docstring. + (let ((lexical-binding t)) + (should (equal (funcall (byte-compile '(lambda (x) "foo")) 'dummy) "foo")))) + ;; Local Variables: ;; no-byte-compile: t ;; End: diff --git a/test/lisp/emacs-lisp/ert-tests.el b/test/lisp/emacs-lisp/ert-tests.el index bdacb0832b3..5c9696105e9 100644 --- a/test/lisp/emacs-lisp/ert-tests.el +++ b/test/lisp/emacs-lisp/ert-tests.el @@ -814,7 +814,7 @@ This macro is used to test if macroexpansion in `should' works." :body (lambda () (should (integerp (ert-fail "Boo")))))))) (should (ert-test-failed-p result)) (should (equal (ert-test-failed-condition result) - '(ert-test-failed ("Boo")))))) + '(ert-test-failed "Boo"))))) (provide 'ert-tests) |