Browse Source

ensuring that test files include org-test in their load path

  again thanks to Nick Dokos for pointing this out
Eric Schulte 14 years ago
parent
commit
be42b2fb51
3 changed files with 18 additions and 5 deletions
  1. 6 2
      testing/lisp/test-ob-exp.el
  2. 6 2
      testing/lisp/test-ob.el
  3. 6 1
      testing/org-test.el

+ 6 - 2
testing/lisp/test-ob-exp.el

@@ -12,8 +12,12 @@
 
 
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-test)
-(require 'org-test-ob-consts)
+(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
 ;;; Tests

+ 6 - 2
testing/lisp/test-ob.el

@@ -12,8 +12,12 @@
 
 
 
 
 ;;; Code:
 ;;; Code:
-(require 'org-test)
-(require 'org-test-ob-consts)
+(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))
 
 
 (ert-deftest test-org-babel-get-src-block-info-language ()
 (ert-deftest test-org-babel-get-src-block-info-language ()
   (org-test-at-marker nil org-test-file-ob-anchor
   (org-test-at-marker nil org-test-file-ob-anchor

+ 6 - 1
testing/org-test.el

@@ -139,7 +139,12 @@ files."
        ";; Template test file for Org-mode tests\n\n"
        ";; Template test file for Org-mode tests\n\n"
        "\n"
        "\n"
        ";;; Code:\n"
        ";;; Code:\n"
-       "(require 'org-test)\n\n"
+       "(let ((load-path (cons (expand-file-name\n"
+       "			\"..\" (file-name-directory\n"
+       "			      (or load-file-name buffer-file-name)))\n"
+       "		       load-path)))\n"
+       "  (require 'org-test)\n"
+       "  (require 'org-test-ob-consts))\n\n"
        "\n"
        "\n"
        ";;; Tests\n"
        ";;; Tests\n"
        "(ert-deftest " name "/example-test ()\n"
        "(ert-deftest " name "/example-test ()\n"