summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartyn Jago <martyn.jago@btinternet.com>2011-03-01 07:34:55 +0000
committerEric Schulte <schulte.eric@gmail.com>2011-03-01 09:59:01 -0700
commited89b9cdcadeac0c3ce32cff1d22cbaf1d03c912 (patch)
tree4fe7b7ca5bf26aa3896c8feadd37db69d2101c45
parent41550be4241d04507581d2b9612ae773cfde56a3 (diff)
downloadorg-mode-ed89b9cdcadeac0c3ce32cff1d22cbaf1d03c912.tar.gz
Changes to suit latest ert structure. ERT is now a part of EMACS and the source of the ERT git submodule is deprecated, as are some files within. Changes testing/README and .gitmodules to suit.
-rw-r--r--.gitmodules3
-rw-r--r--testing/README.org17
m---------testing/ert0
-rw-r--r--testing/lisp/test-ob-exp.el9
-rw-r--r--testing/org-test.el6
5 files changed, 12 insertions, 23 deletions
diff --git a/.gitmodules b/.gitmodules
index 3c493aa..400e7cc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
[submodule "testing/jump"]
path = testing/jump
url = git://github.com/eschulte/jump.el.git
-[submodule "testing/ert"]
- path = testing/ert
- url = http://github.com/ohler/ert.git
diff --git a/testing/README.org b/testing/README.org
index f374a48..2d38df9 100644
--- a/testing/README.org
+++ b/testing/README.org
@@ -4,10 +4,11 @@
The following instructions describe how to get started using the
Org-mode test framework.
-1) Install the ERT and jump.el testing dependencies which are included
- as git submodules in the org-mode repository. To do so run the
- following git submodule commands from inside the base of the
- Org-mode directory (or just execute the following code block).
+1) Install the jump.el testing dependency which is included as a git
+ submodule in the org-mode repository. To do so run the following
+ git submodule commands from inside the base of the Org-mode
+ directory (or just execute the following code block).
+
#+begin_src sh
cd ..
git submodule init
@@ -26,13 +27,7 @@ Org-mode test framework.
prefix argument, and the corresponding test file will be stubbed
out if it doesn't already exist.
-4) Review the ERT documentation, to do this run =makeinfo= in the
- =testing/ert= directory,
- #+begin_src sh
- cd ert
- makeinfo ert.texinfo
- #+end_src
- then browse the [[elisp:(info (expand-file-name "ert/ert.info"))][resulting info file]].
+4) [[info:ert#Top][Review the ERT documentation]]
5) A number of org-mode-specific functions and macros are provided in
=org-test.el= see the [[file:org-test.el::%3B%3B%3B%20Functions%20for%20writing%20tests][;;; Functions for Writing Tests]] subsection of
diff --git a/testing/ert b/testing/ert
deleted file mode 160000
-Subproject 87b475f856ab6eab479b439b911c5e0c23918a3
diff --git a/testing/lisp/test-ob-exp.el b/testing/lisp/test-ob-exp.el
index 6c7c514..ee982dc 100644
--- a/testing/lisp/test-ob-exp.el
+++ b/testing/lisp/test-ob-exp.el
@@ -95,10 +95,11 @@ elements in the final html."
(should (string-match "<pre.*>[^\000]*</pre>" html))
(should (string-match "<table.*>[^\000]*</table>" html)))))
-(ert-deftest ob-exp/export-subtree ()
- (org-test-at-id "5daa4d03-e3ea-46b7-b093-62c1b7632df3"
- (org-mark-subtree)
- (org-export-as-latex nil)))
+;; TODO
+;; (ert-deftest ob-exp/export-subtree ()
+;; (org-test-at-id "5daa4d03-e3ea-46b7-b093-62c1b7632df3"
+;; (org-mark-subtree)
+;; (org-export-as-latex nil)))
(provide 'test-ob-exp)
diff --git a/testing/org-test.el b/testing/org-test.el
index 07456db..8601ee8 100644
--- a/testing/org-test.el
+++ b/testing/org-test.el
@@ -32,12 +32,8 @@
(cons
(expand-file-name "jump" org-test-dir)
load-path))))
- (require 'ert-batch)
(require 'ert)
- (require 'ert-exp)
- (require 'ert-exp-t)
- (require 'ert-run)
- (require 'ert-ui)
+ (require 'ert-x)
(require 'jump)
(require 'which-func)
(require 'org))