emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* [PATCH] Modifications to enable test script to run with emacs-23 and emacs-22
@ 2011-09-20  7:59 Martyn Jago
  2011-09-20 15:03 ` Eric Schulte
  0 siblings, 1 reply; 7+ messages in thread
From: Martyn Jago @ 2011-09-20  7:59 UTC (permalink / raw)
  To: emacs-orgmode

[-- Attachment #1: Type: text/plain, Size: 179 bytes --]

Hi

With this patch, the command-line test script now passes all tests on
Emacs 24, 23 and 22. 

On 23 and 22, testing directory should include ert.el and ert-x.el

Best, Martyn


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Enable test script to run with emacs-23 and emacs-22 --]
[-- Type: text/x-patch, Size: 7012 bytes --]

From 6ab323b099f55462f690d44f6ad482c962461a97 Mon Sep 17 00:00:00 2001
From: Martyn Jago <martyn.jago@btinternet.com>
Date: Tue, 20 Sep 2011 08:44:24 +0100
Subject: [PATCH] Modifications to enable test script to run with emacs-23 and emacs-22
 * testing/org-test.el:
 enable test script to run with emacs-23 and emacs-22
 * testing/lisp/test-org-exp.el: added org-ascii requirement

---
 testing/lisp/test-org-exp.el |   15 +++--
 testing/org-test.el          |  112 +++++++++++++++++++++--------------------
 2 files changed, 66 insertions(+), 61 deletions(-)

diff --git a/testing/lisp/test-org-exp.el b/testing/lisp/test-org-exp.el
index 348538f..0ed8d68 100644
--- a/testing/lisp/test-org-exp.el
+++ b/testing/lisp/test-org-exp.el
@@ -7,11 +7,12 @@
 ;; see: http://www.gnu.org/licenses/gpl-3.0.html
 
 (let ((load-path (cons (expand-file-name
-			".." (file-name-directory
-			      (or load-file-name buffer-file-name)))
-		       load-path)))
+                        ".." (file-name-directory
+                              (or load-file-name buffer-file-name)))
+                       load-path)))
   (require 'org-test)
-  (require 'org-test-ob-consts))
+  (require 'org-test-ob-consts)
+  (require 'org-ascii))
 
 (ert-deftest test-org-exp/stripping-commas ()
   "Test the stripping of commas from within blocks during export."
@@ -19,5 +20,7 @@
     ;; don't strip internal commas
     (org-narrow-to-subtree)
     (should (string-match
-	     ", 2"
-	     (org-export-as-ascii nil nil nil 'string)))))
+             ", 2"
+             (org-export-as-ascii nil nil nil 'string)))))
+
+(provide 'test-org-exp)
diff --git a/testing/org-test.el b/testing/org-test.el
index 7789cbe..9b4313f 100644
--- a/testing/org-test.el
+++ b/testing/org-test.el
@@ -30,17 +30,20 @@
 
 \f
 ;;;; Code:
-(let ((org-test-dir (expand-file-name
+(let* ((org-test-dir (expand-file-name
 		      (file-name-directory
-		       (or load-file-name buffer-file-name)))))
-   (let ((org-lisp-dir (expand-file-name
-   		       (concat org-test-dir "../lisp"))))
-     (unless (featurep 'org)
-       (setq load-path (cons org-lisp-dir load-path))
-       (org-babel-do-load-languages
-	'org-babel-load-languages '((sh . t)))))
-   (let* ((load-path (cons
-		     (expand-file-name "ert" org-test-dir)
+		       (or load-file-name buffer-file-name))))
+       (org-lisp-dir (expand-file-name
+		      (concat org-test-dir "../lisp"))))
+
+  (unless (featurep 'org)
+    (setq load-path (cons org-lisp-dir load-path))
+    (require 'org)
+    (org-babel-do-load-languages
+     'org-babel-load-languages '((sh . t))))
+
+  (let* ((load-path (cons
+		     org-test-dir
 		     (cons
 		      (expand-file-name "jump" org-test-dir)
 		      load-path))))
@@ -69,8 +72,7 @@
     (when (file-exists-p
 	   (expand-file-name "jump/jump.el" org-test-dir))
       (require 'jump)
-      (require 'which-func))
-    (require 'org)))
+      (require 'which-func))))
 
 (defconst org-test-default-test-file-name "tests.el"
   "For each defun a separate file with tests may be defined.
@@ -181,49 +183,49 @@ then remove it and place the point there before running BODY."
 \f
 ;;; 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")
-   ("contrib/lisp/\\1.el" . "testing/contrib/lisp/test-\\1.el")
-   ("contrib/lisp/\\1.el" . "testing/contrib/lisp/\\1.el/test.*.el")
-   ("testing/lisp/test-\\1.el" . "lisp/\\1.el")
-   ("testing/lisp/\\1.el" . "lisp/\\1.el/test.*.el")
-   ("testing/contrib/lisp/test-\\1.el" . "contrib/lisp/\\1.el")
-   ("testing/contrib/lisp/test-\\1.el" . "contrib/lisp/\\1.el/test.*.el"))
-  (concat org-base-dir "/")
-  "Jump between org-mode files and their tests."
-  (lambda (path)
-    (let* ((full-path (expand-file-name path org-base-dir))
-	  (file-name (file-name-nondirectory path))
-	  (name (file-name-sans-extension file-name)))
-      (find-file full-path)
-      (insert
-       ";;; " file-name "\n\n"
-       ";; Copyright (c) " (nth 5 (decode-time (current-time)))
-       " " user-full-name "\n"
-       ";; Authors: " user-full-name "\n\n"
-       ";; Released under the GNU General Public License version 3\n"
-       ";; see: http://www.gnu.org/licenses/gpl-3.0.html\n\n"
-       ";;;; Comments:\n\n"
-       ";; Template test file for Org-mode tests\n\n"
-       "\f\n"
-       ";;; Code:\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"
-       "\f\n"
-       ";;; Tests\n"
-       "(ert-deftest " name "/example-test ()\n"
-       "  \"Just an example to get you started.\"\n"
-       "  (should t)\n"
-       "  (should-not nil)\n"
-       "  (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)))))
+  (defjump org-test-jump
+    (("lisp/\\1.el" . "testing/lisp/test-\\1.el")
+     ("lisp/\\1.el" . "testing/lisp/\\1.el/test.*.el")
+     ("contrib/lisp/\\1.el" . "testing/contrib/lisp/test-\\1.el")
+     ("contrib/lisp/\\1.el" . "testing/contrib/lisp/\\1.el/test.*.el")
+     ("testing/lisp/test-\\1.el" . "lisp/\\1.el")
+     ("testing/lisp/\\1.el" . "lisp/\\1.el/test.*.el")
+     ("testing/contrib/lisp/test-\\1.el" . "contrib/lisp/\\1.el")
+     ("testing/contrib/lisp/test-\\1.el" . "contrib/lisp/\\1.el/test.*.el"))
+    (concat org-base-dir "/")
+    "Jump between org-mode files and their tests."
+    (lambda (path)
+      (let* ((full-path (expand-file-name path org-base-dir))
+	     (file-name (file-name-nondirectory path))
+	     (name (file-name-sans-extension file-name)))
+	(find-file full-path)
+	(insert
+	 ";;; " file-name "\n\n"
+	 ";; Copyright (c) " (nth 5 (decode-time (current-time)))
+	 " " user-full-name "\n"
+	 ";; Authors: " user-full-name "\n\n"
+	 ";; Released under the GNU General Public License version 3\n"
+	 ";; see: http://www.gnu.org/licenses/gpl-3.0.html\n\n"
+	 ";;;; Comments:\n\n"
+	 ";; Template test file for Org-mode tests\n\n"
+	 "\f\n"
+	 ";;; Code:\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"
+	 "\f\n"
+	 ";;; Tests\n"
+	 "(ert-deftest " name "/example-test ()\n"
+	 "  \"Just an example to get you started.\"\n"
+	 "  (should t)\n"
+	 "  (should-not nil)\n"
+	 "  (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)))))
 
 (define-key emacs-lisp-mode-map "\M-\C-j" 'org-test-jump)
 
-- 
1.7.3.4


[-- Attachment #3: Type: text/plain, Size: 159 bytes --]


---
Org-mode version 7.7 (release_7.7.306.g6ab3)
GNU Emacs 24.0.50.1 (x86_64-apple-darwin, NS apple-appkit-1038.35)
 of 2011-08-21 on virtualmac.porkrind.org

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2011-09-28  0:43 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-20  7:59 [PATCH] Modifications to enable test script to run with emacs-23 and emacs-22 Martyn Jago
2011-09-20 15:03 ` Eric Schulte
2011-09-25  7:35   ` David Maus
2011-09-25  8:18     ` Martyn Jago
2011-09-26 12:07       ` Eric Schulte
2011-09-26 17:51         ` Achim Gratz
2011-09-28  0:37           ` Eric Schulte

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).