From 618eb91e12bb1474765401b18890631850dc3850 Mon Sep 17 00:00:00 2001 From: Eric Schulte Date: Thu, 1 Mar 2012 11:28:46 -0700 Subject: [PATCH] fully remove contrib/ from the test infrastucture --- testing/org-test.el | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/testing/org-test.el b/testing/org-test.el index 3696db126..df06e65b8 100644 --- a/testing/org-test.el +++ b/testing/org-test.el @@ -224,12 +224,8 @@ otherwise place the point at the beginning of the inserted text." (defjump org-test-jump (("lisp/\\1.el" . "testing/lisp/test-\\1.el") ("lisp/\\1.el" . "testing/lisp/\\1.el/test.*.el") - ("contrib/lisp/\\1.el" . "testing/contrib/lisp/test-\\1.el") - ("contrib/lisp/\\1.el" . "testing/contrib/lisp/\\1.el/test.*.el") ("testing/lisp/test-\\1.el" . "lisp/\\1.el") - ("testing/lisp/\\1.el" . "lisp/\\1.el/test.*.el") - ("testing/contrib/lisp/test-\\1.el" . "contrib/lisp/\\1.el") - ("testing/contrib/lisp/test-\\1.el" . "contrib/lisp/\\1.el/test.*.el")) + ("testing/lisp/\\1.el" . "lisp/\\1.el/test.*.el")) (concat org-base-dir "/") "Jump between org-mode files and their tests." (lambda (path) @@ -313,8 +309,7 @@ otherwise place the point at the beginning of the inserted text." :expected-result :failed (should nil)))))))) (directory-files base 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*\\.el$")))) - (rld (expand-file-name "lisp" org-test-dir)) - (rld (expand-file-name "lisp" (expand-file-name "contrib" org-test-dir))))) + (rld (expand-file-name "lisp" org-test-dir)))) (defun org-test-current-defun () "Test the current function."