Move two test files into common test directory

* testing/lisp/test-org-element.el: Moved location from
  testing/contrib/lisp/ to testing/lisp.
* testing/lisp/test-org-export.el: Moved location from
  testing/contrib/lisp/ to testing/lisp.

testing/contrib/lisp/.gitignore

@@ -1 +0,0 @@
-# this file ensures that the testing/contrib/lisp directory is created by git

testing/lisp/test-org-element.el

@@ -21,13 +21,8 @@
 
 ;;; Code:
 
-(let ((load-path (cons (expand-file-name
-			".." (file-name-directory
-			      (or load-file-name buffer-file-name)))
-		       load-path)))
-  (require 'org-test)
-  (require 'org-test-ob-consts)
-  (require 'org-element))
+(unless (featurep 'org-element)
+  (signal 'missing-test-dependency "org-element"))
 
 
 

testing/lisp/test-org-export.el

@@ -12,13 +12,9 @@
 
 
 ;;; Code:
-(let ((load-path (cons (expand-file-name
-			".." (file-name-directory
-			      (or load-file-name buffer-file-name)))
-		       load-path)))
-  (require 'org-test)
-  (require 'org-test-ob-consts)
-  (require 'org-export))
+
+(unless (featurep 'org-export)
+  (signal 'missing-test-dependency "org-export"))