org-test: Fix ERC errors using latest Emacs master

* testing/lisp/test-ob-C.el:
* testing/lisp/test-ob-awk.el:
* testing/lisp/test-ob-sed.el: Add missing provide.
* testing/lisp/test-property-inheritance.el: Fix incorrect feature
name.
* testing/org-test.el (org-test-load): Use `require' instead of
`load-file' to load tests.  `load-file' can lead to duplicate test
definitions that now trigger ERC errors.

See https://lists.gnu.org/archive/html/bug-gnu-emacs/2021-11/msg01968.html
This commit is contained in:
Ihor Radchenko 2021-11-24 20:02:38 +08:00
parent 0d7cf4e402
commit 9044b300ee
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
5 changed files with 11 additions and 4 deletions

View File

@ -183,4 +183,5 @@
("Friday" "friday")) ("Friday" "friday"))
(org-babel-execute-src-block)))))) (org-babel-execute-src-block))))))
(provide 'test-ob-C)
;;; test-ob-C.el ends here ;;; test-ob-C.el ends here

View File

@ -46,3 +46,6 @@
(org-test-at-id "9e998b2a-3581-43fe-b26d-07d3c507b86a" (org-test-at-id "9e998b2a-3581-43fe-b26d-07d3c507b86a"
(org-babel-next-src-block 4) (org-babel-next-src-block 4)
(should (equal '(("a" "b" "c")) (org-babel-execute-src-block))))) (should (equal '(("a" "b" "c")) (org-babel-execute-src-block)))))
(provide 'test-ob-awk)
;;; test-ob-awk.el ends here

View File

@ -58,5 +58,5 @@
(buffer-string))))))) (buffer-string)))))))
(provide 'test-ob-sed)
;;; test-ob-sed ends here ;;; test-ob-sed ends here

View File

@ -45,6 +45,5 @@
(org-babel-next-src-block 3) (org-babel-next-src-block 3)
(should (= 6 (org-babel-execute-src-block))))) (should (= 6 (org-babel-execute-src-block)))))
(provide 'test-ob-R) (provide 'test-property-inheritance)
;;; test-property-inheritance.el ends here ;;; test-property-inheritance.el ends here

View File

@ -373,7 +373,11 @@ setting `pp-escape-newlines' to nil manually."
(condition-case err (condition-case err
(when (string-match "^[A-Za-z].*\\.el$" (when (string-match "^[A-Za-z].*\\.el$"
(file-name-nondirectory path)) (file-name-nondirectory path))
(load-file path)) (let ((feature-name
(intern
(file-name-base
(file-name-nondirectory path)))))
(require feature-name path)))
(missing-test-dependency (missing-test-dependency
(let ((name (intern (let ((name (intern
(concat "org-missing-dependency/" (concat "org-missing-dependency/"