From b3111a4ea6b2e5b134634c7eebf27a210529df58 Mon Sep 17 00:00:00 2001
From: Martyn Jago <martyn.jago@btinternet.com>
Date: Mon, 12 Sep 2011 16:50:28 +0100
Subject: [PATCH] Remove jump.el dependency from test execution
 * testing/org-test.el:
 Remove jump.el dependency from test execution removing the need for a
 user to install git submodules

---
 testing/org-test.el |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/testing/org-test.el b/testing/org-test.el
index a8b5b49..136a287 100644
--- a/testing/org-test.el
+++ b/testing/org-test.el
@@ -16,11 +16,13 @@
 ;; called while in a `defun' all ert tests with names matching the
 ;; name of the function are run.
 
-;;; Prerequisites:
-
-;; ERT and jump.el are both included as git submodules, install with
-;;   $ git submodule init
-;;   $ git submodule update
+;;; Test Development
+;; For test development purposes a number of navigation and test
+;; function construction routines are available as a git submodule
+;; (jump.el)
+;; Install with...
+;; $ git submodule init
+;; $ git submodule update
 
 
 ;;;; Code:
@@ -38,13 +40,15 @@
 		     (cons
 		      (expand-file-name "jump" org-test-dir)
 		      load-path))))
+    (require 'cl)
     (require 'ert)
     (require 'ert-x)
-    (require 'jump)
-    (require 'which-func)
+    (when (file-exists-p
+	   (expand-file-name "jump/jump.el" org-test-dir))
+      (require 'jump)
+      (require 'which-func))
     (require 'org)))
 
-
 (defconst org-test-default-test-file-name "tests.el"
   "For each defun a separate file with tests may be defined.
 tests.el is the fallback or default if you like.")
@@ -136,6 +140,7 @@ files."
 
 
 ;;; Navigation Functions
+(when (featurep 'jump)
 (defjump org-test-jump
   (("lisp/\\1.el" . "testing/lisp/test-\\1.el")
    ("lisp/\\1.el" . "testing/lisp/\\1.el/test.*.el")
@@ -178,7 +183,7 @@ files."
        "  (should-error (error \"errr...\")))\n\n\n"
        "(provide '" name ")\n\n"
        ";;; " file-name " ends here\n") full-path))
-  (lambda () ((lambda (res) (if (listp res) (car res) res)) (which-function))))
+  (lambda () ((lambda (res) (if (listp res) (car res) res)) (which-function)))))
 
 (define-key emacs-lisp-mode-map "\M-\C-j" 'org-test-jump)
 
-- 
1.7.3.4