[Accepted] [O,babel] ERT as external library deprecated.

[Bastien Guerry <bzg@altern.org>]

Patch 639 (http://patchwork.newartisans.com/patch/639/) is now "Accepted".

Maintainer comment: none

This relates to the following submission:

http://mid.gmane.org/%3C87pqqb2k5t.fsf%40btinternet.com%3E

Here is the original message containing the patch:

> Content-Type: text/plain; charset="utf-8"
> MIME-Version: 1.0
> Content-Transfer-Encoding: 7bit
> Subject: [O,babel] ERT as external library deprecated.
> Date: Tue, 01 Mar 2011 15:46:06 -0000
> From: Martyn Jago <martyn.jago@btinternet.com>
> X-Patchwork-Id: 639
> Message-Id: <87pqqb2k5t.fsf@btinternet.com>
> To: emacs-orgmode@gnu.org
> 
> Hi
> 
> The ERT library is now a part of EMACS. As a result the ERT library
> files currently loaded as a sub-module have been deleted on Github. 
> 
> This change modifies .gitmodule to avoid attempting to load ERT.
> Changes have been made to testing/README.org to suit.
> 
> An insertion has been made to testing/README.org to point out that the
> library-of-babel.org file needs ingesting (including a source block to
> do so) to enable some tests to pass, and the "ERT reference" now points
> to the included ERT info help pages.
> 
> Broken dependencies in testing/org-test.el have been removed.
> 
> I have also temporarily commented out a small number of broken tests
> which between them cause ERT to go off into the weeds and delete a large
> section of babel.org. This means that all tests currently pass.
> 
> I will investigate the breakages and hopefully provide fixes.
> 
> Hope this helps
> 
> Martyn
> 
> ---
> Org-mode version 7.4 (release_7.4.558.g1e39)
> GNU Emacs 24.0.50.1 (i686-pc-linux-gnu, GTK+ Version 2.24.0)
>  of 2011-02-25
> 
> >From c4772a9786371c006a2637528a25414033d208c9 Mon Sep 17 00:00:00 2001
> From: Martyn Jago <martyn.jago@btinternet.com>
> Date: Tue, 1 Mar 2011 07:34:55 +0000
> Subject: [PATCH 1/3] 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.
> 
> ---
>  .gitmodules                 |    3 ---
>  testing/README.org          |   17 ++++++-----------
>  testing/ert                 |    1 -
>  testing/lisp/test-ob-exp.el |    9 +++++----
>  testing/org-test.el         |    6 +-----
>  5 files changed, 12 insertions(+), 24 deletions(-)
>  delete mode 160000 testing/ert
> 
> 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
> index 87b475f..0000000
> --- a/testing/ert
> +++ /dev/null
> @@ -1 +0,0 @@
> -Subproject commit 87b475f856ab6eab479b439b911c5e0c23918a36
> 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))
> -- 
> 1.7.2.3
> 
>