From 8740f212d03982bd60c7ba4cb8444caabb86da22 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <n.goaziou@gmail.com>
Date: Wed, 29 Feb 2012 18:38:54 +0100
Subject: [PATCH] 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 -
 testing/{contrib => }/lisp/test-org-element.el |  9 ++-------
 testing/{contrib => }/lisp/test-org-export.el  | 10 +++-------
 3 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 testing/contrib/lisp/.gitignore
 rename testing/{contrib => }/lisp/test-org-element.el (97%)
 rename testing/{contrib => }/lisp/test-org-export.el (98%)

diff --git a/testing/contrib/lisp/.gitignore b/testing/contrib/lisp/.gitignore
deleted file mode 100644
index 6e7ef91f9..000000000
--- a/testing/contrib/lisp/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-# this file ensures that the testing/contrib/lisp directory is created by git
\ No newline at end of file
diff --git a/testing/contrib/lisp/test-org-element.el b/testing/lisp/test-org-element.el
similarity index 97%
rename from testing/contrib/lisp/test-org-element.el
rename to testing/lisp/test-org-element.el
index 0c0ae184f..567540a7b 100644
--- a/testing/contrib/lisp/test-org-element.el
+++ b/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"))
 
 
 
diff --git a/testing/contrib/lisp/test-org-export.el b/testing/lisp/test-org-export.el
similarity index 98%
rename from testing/contrib/lisp/test-org-export.el
rename to testing/lisp/test-org-export.el
index c9923d4bb..faa277375 100644
--- a/testing/contrib/lisp/test-org-export.el
+++ b/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"))