diff options
author | Nicolas Goaziou <n.goaziou@gmail.com> | 2012-02-29 18:38:54 +0100 |
---|---|---|
committer | Nicolas Goaziou <n.goaziou@gmail.com> | 2012-02-29 18:39:32 +0100 |
commit | 8740f212d03982bd60c7ba4cb8444caabb86da22 (patch) | |
tree | 3bcd73c2c2158d5be5cb26a697f185dd9c6b9196 | |
parent | e5fa93c9bec7acf5eb8e9f5e4451691df7121b0a (diff) | |
download | org-mode-8740f212d03982bd60c7ba4cb8444caabb86da22.tar.gz |
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.
-rw-r--r-- | testing/contrib/lisp/.gitignore | 1 | ||||
-rw-r--r-- | testing/lisp/test-org-element.el (renamed from testing/contrib/lisp/test-org-element.el) | 9 | ||||
-rw-r--r-- | testing/lisp/test-org-export.el (renamed from testing/contrib/lisp/test-org-export.el) | 10 |
3 files changed, 5 insertions, 15 deletions
diff --git a/testing/contrib/lisp/.gitignore b/testing/contrib/lisp/.gitignore deleted file mode 100644 index 6e7ef91..0000000 --- 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 index 0c0ae18..567540a 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 index c9923d4..faa2773 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")) |