From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martyn Jago Subject: [patch][babel] Fix latest block export tests to suit Emacs 22 Date: Fri, 06 Jan 2012 08:21:03 +0000 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([140.186.70.92]:47689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rj53J-0005td-H3 for emacs-orgmode@gnu.org; Fri, 06 Jan 2012 03:21:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rj53I-00042S-8Q for emacs-orgmode@gnu.org; Fri, 06 Jan 2012 03:21:29 -0500 Received: from lo.gmane.org ([80.91.229.12]:45193) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rj53H-00042F-Qh for emacs-orgmode@gnu.org; Fri, 06 Jan 2012 03:21:28 -0500 Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1Rj53F-0002AR-Az for emacs-orgmode@gnu.org; Fri, 06 Jan 2012 09:21:25 +0100 Received: from 88-96-171-138.dsl.zen.co.uk ([88.96.171.138]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 06 Jan 2012 09:21:24 +0100 Received: from martyn.jago by 88-96-171-138.dsl.zen.co.uk with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 06 Jan 2012 09:21:24 +0100 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain What appears to be a subtle difference in html export detail between Emacs 22 and Emacs 23+ breaks these latest tests on Emacs 22. The attached patch fixes them (and the subtle difference is not relevant to these tests). Best, Martyn --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Changes-to-latest-block-export-tests-to-suit-Emacs-2.patch Content-Description: changes to block export tests to suit Emacs 22 >From b67f2c34fb2bea791b847c3dbb7dc26e313f779f Mon Sep 17 00:00:00 2001 From: Martyn Jago Date: Fri, 6 Jan 2012 08:08:21 +0000 Subject: [PATCH] Changes to latest block export tests to suit Emacs 22. * testing/lisp/test-ob-exp.el: Changes to latest block export tests to suit Emacs 22. --- testing/lisp/test-ob-exp.el | 40 ++++++++++++++-------------------------- 1 files changed, 14 insertions(+), 26 deletions(-) diff --git a/testing/lisp/test-ob-exp.el b/testing/lisp/test-ob-exp.el index 85af683..8ef27dd 100644 --- a/testing/lisp/test-ob-exp.el +++ b/testing/lisp/test-ob-exp.el @@ -73,7 +73,7 @@ (org-test-at-id "eb1f6498-5bd9-45e0-9c56-50717053e7b7" (org-narrow-to-subtree) (let ((exported-html - (org-export-as-html nil nil nil 'string)) + (org-export-as-html nil nil nil 'string 'body-only)) (test-point 0)) (org-test-with-temp-text-in-file @@ -86,9 +86,7 @@ x nil t))) (setq test-point (point))) - '("" "" "" - ":noweb header argument expansion" - ":noweb header argument expansion" + '(":noweb header argument expansion" "message" "expanded1" "message" "expanded2" "noweb-1-yes-start" @@ -99,8 +97,7 @@ "message" "expanded2" "noweb-tangle-start" "<<noweb-example1>>" - "<<noweb-example2>>" - "")))))) + "<<noweb-example2>>")))))) (ert-deftest ob-exp/noweb-on-export-with-exports-results () "Noweb header arguments export correctly using :exports results. @@ -110,7 +107,7 @@ (org-test-at-id "8701beb4-13d9-468c-997a-8e63e8b66f8d" (org-narrow-to-subtree) (let ((exported-html - (org-export-as-html nil nil nil 'string)) + (org-export-as-html nil nil nil 'string 'body-only)) (test-point 0)) (org-test-with-temp-text-in-file @@ -123,9 +120,7 @@ x nil t))) (setq test-point (point))) - '("" "" "" - ":noweb header argument expansion using :exports results" - ":noweb header argument expansion using :exports results" + '(":noweb header argument expansion using :exports results" "expanded1" "expanded2" "expanded1" @@ -133,8 +128,7 @@ "<<noweb-example1>>" "expanded2" "<<noweb-example1>>" - "<<noweb-example2>>" - "")))))) + "<<noweb-example2>>")))))) (ert-deftest ob-exp/exports-both () "Test the :exports both header argument. @@ -143,9 +137,8 @@ elements in the final html." (org-test-at-id "92518f2a-a46a-4205-a3ab-bcce1008a4bb" (org-narrow-to-subtree) (let ((exported-html - (org-export-as-html nil nil nil 'string)) + (org-export-as-html nil nil nil 'string 'body-only)) (test-point 0)) - (org-test-with-temp-text-in-file exported-html @@ -156,9 +149,7 @@ elements in the final html." x nil t))) (setq test-point (point))) - '("" "" "" - "Pascal's Triangle – exports both test" - "Pascal's Triangle – exports both test" + '( "Pascal's Triangle – exports both test" """>1<"">3<"">3<"">1<""" """>1<"">4<"">6<"">4<"">1<""" """>1<"">5<"">10<"">10<"">5<"">1<""" - """" - "")))))) + """")))))) (ert-deftest ob-exp/mixed-blocks-with-exports-both () (org-test-at-id "5daa4d03-e3ea-46b7-b093-62c1b7632df3" (org-narrow-to-subtree) (let ((exported-html - (org-export-as-html nil nil nil 'string)) + (org-export-as-html nil nil nil 'string 'body-only)) (test-point 0)) (org-test-with-temp-text-in-file exported-html @@ -192,9 +182,7 @@ elements in the final html." x nil t))) (setq test-point (point))) - '("" "" "" - "mixed blocks with exports both" - "mixed blocks with exports both" + '("mixed blocks with exports both" "

""a""
""b""

"
 		  "code block results"
-		  "