fully remove contrib/ from the test infrastucture

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."