diff options
author | Eric Schulte <schulte.eric@gmail.com> | 2011-09-06 11:11:12 -0600 |
---|---|---|
committer | Eric Schulte <schulte.eric@gmail.com> | 2011-09-06 11:12:29 -0600 |
commit | f0d139adfa3f3b6599072a0b3c1672350fe9834d (patch) | |
tree | 6de2940a79271dd4c45af317a3c4f5bc4478596d | |
parent | fe77c6674194e0f7e16adaa33d01b48990164fd2 (diff) | |
download | org-mode-f0d139adfa3f3b6599072a0b3c1672350fe9834d.tar.gz |
correctly resolving load-path in testing files
* testing/lisp/test-org.el (testing-lisp-dir): Require all files with
load-path set.
* testing/lisp/test-ob-lob.el (expand-file-name): Relative load path.
* testing/lisp/test-ob-fortran.el (load-path): Relative load path.
-rw-r--r-- | testing/lisp/test-ob-fortran.el | 17 | ||||
-rw-r--r-- | testing/lisp/test-ob-lob.el | 25 | ||||
-rw-r--r-- | testing/lisp/test-org.el | 12 |
3 files changed, 35 insertions, 19 deletions
diff --git a/testing/lisp/test-ob-fortran.el b/testing/lisp/test-ob-fortran.el index 1eb58b8..c3bde0b 100644 --- a/testing/lisp/test-ob-fortran.el +++ b/testing/lisp/test-ob-fortran.el @@ -1,5 +1,18 @@ -(require 'ob-fortran) - +(let ((load-path (cons (expand-file-name + "langs" + (expand-file-name + "babel" + (expand-file-name + "contrib" + (expand-file-name + ".." + (expand-file-name + ".." + (file-name-directory + (or load-file-name buffer-file-name))))))) + load-path))) + (require 'ob-fortran)) + (ert-deftest ob-fortran/assert () (should t)) diff --git a/testing/lisp/test-ob-lob.el b/testing/lisp/test-ob-lob.el index 60f9399..ebfc14a 100644 --- a/testing/lisp/test-ob-lob.el +++ b/testing/lisp/test-ob-lob.el @@ -8,19 +8,22 @@ ;;;; Comments: -;; Template test file for Org-mode tests - - -;;; 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)) - ;;; Tests +(org-babel-lob-ingest + (expand-file-name + "library-of-babel.org" + (expand-file-name + "babel" + (expand-file-name + "contrib" + (expand-file-name + ".." + (expand-file-name + ".." + (file-name-directory + (or load-file-name buffer-file-name)))))))) + (ert-deftest test-ob-lob/ingest () "Test the ingestion of an org-mode file." (should (< 0 (org-babel-lob-ingest diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el index 85a3e4a..1c81fac 100644 --- a/testing/lisp/test-org.el +++ b/testing/lisp/test-org.el @@ -12,12 +12,12 @@ ;;; 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)) +(let* ((testing-lisp-dir (file-name-directory + (or load-file-name buffer-file-name))) + (load-path (cons testing-lisp-dir load-path))) + (dolist (file (directory-files testing-lisp-dir 'full + "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*\\.org$")) + (require (intern (substring file 0 (- (length file) 3)))))) ;;; Tests |