Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r75437 - in branches/quickbook-dev/tools/quickbook/test: . include versions
From: dnljms_at_[hidden]
Date: 2011-11-10 13:14:10


Author: danieljames
Date: 2011-11-10 13:14:08 EST (Thu, 10 Nov 2011)
New Revision: 75437
URL: http://svn.boost.org/trac/boost/changeset/75437

Log:
Quickbook: Fix some tests.

I use compatibility mode to decide whether to link headers to
themselves. I'm not sure about that.
Text files modified:
   branches/quickbook-dev/tools/quickbook/test/Jamfile.v2 | 1 +
   branches/quickbook-dev/tools/quickbook/test/include/Jamfile.v2 | 4 ++--
   branches/quickbook-dev/tools/quickbook/test/versions/versions-1_6.gold | 13 ++++++++-----
   branches/quickbook-dev/tools/quickbook/test/versions/versions-1_6.quickbook | 12 ++++++------
   4 files changed, 17 insertions(+), 13 deletions(-)

Modified: branches/quickbook-dev/tools/quickbook/test/Jamfile.v2
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/Jamfile.v2 (original)
+++ branches/quickbook-dev/tools/quickbook/test/Jamfile.v2 2011-11-10 13:14:08 EST (Thu, 10 Nov 2011)
@@ -16,6 +16,7 @@
 build-project command-line ;
 build-project snippets ;
 build-project "include" ;
+build-project versions ;
 
 import quickbook-testing : quickbook-test quickbook-error-test ;
 

Modified: branches/quickbook-dev/tools/quickbook/test/include/Jamfile.v2
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/include/Jamfile.v2 (original)
+++ branches/quickbook-dev/tools/quickbook/test/include/Jamfile.v2 2011-11-10 13:14:08 EST (Thu, 10 Nov 2011)
@@ -33,6 +33,6 @@
     [ quickbook-error-test section-fail2 ]
     [ quickbook-test in_section-1_5 ]
     [ quickbook-test in_section-1_6 ]
- #[ quickbook-test compatibility-1_1 ]
- #[ quickbook-test compatibility-1_5 ]
+ [ quickbook-test compatibility-1_1 ]
+ [ quickbook-test compatibility-1_5 ]
     ;

Modified: branches/quickbook-dev/tools/quickbook/test/versions/versions-1_6.gold
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/versions/versions-1_6.gold (original)
+++ branches/quickbook-dev/tools/quickbook/test/versions/versions-1_6.gold 2011-11-10 13:14:08 EST (Thu, 10 Nov 2011)
@@ -9,7 +9,8 @@
   <section id="mixed_version_tests.section_ids">
     <title><link linkend="mixed_version_tests.section_ids">Section ids in templates</link></title>
     <section id="mixed_version_tests.section_ids.in_a_1_1_template">
- <title>In a 1.1 template</title>
+ <title><link linkend="mixed_version_tests.section_ids.in_a_1_1_template">In
+ a 1.1 template</link></title>
       <para>
         Some text
       </para>
@@ -41,13 +42,13 @@
         </para>
       </section>
       <section id="1_1_templates.in_a_1_4_template">
- <title><link linkend="1_1_templates.in_a_1_4_template">In a 1.4 template</link></title>
+ <title>In a 1.4 template</title>
         <para>
           Some text
         </para>
       </section>
       <section id="1_1_templates.in_a_1_5_template">
- <title><link linkend="1_1_templates.in_a_1_5_template">In a 1.5 template</link></title>
+ <title>In a 1.5 template</title>
         <para>
           Some text
         </para>
@@ -60,7 +61,8 @@
     <section id="1_4_templates.1_4_document">
       <title><link linkend="1_4_templates.1_4_document">1.4 Document</link></title>
       <section id="1_4_templates.1_4_document.in_a_1_1_template">
- <title>In a 1.1 template</title>
+ <title><link linkend="1_4_templates.1_4_document.in_a_1_1_template">In a
+ 1.1 template</link></title>
         <para>
           Some text
         </para>
@@ -87,7 +89,8 @@
     <section id="1_5_templates.1_5_document">
       <title><link linkend="1_5_templates.1_5_document">1.5 Document</link></title>
       <section id="1_5_templates.1_5_document.in_a_1_1_template">
- <title>In a 1.1 template</title>
+ <title><link linkend="1_5_templates.1_5_document.in_a_1_1_template">In a
+ 1.1 template</link></title>
         <para>
           Some text
         </para>

Modified: branches/quickbook-dev/tools/quickbook/test/versions/versions-1_6.quickbook
==============================================================================
--- branches/quickbook-dev/tools/quickbook/test/versions/versions-1_6.quickbook (original)
+++ branches/quickbook-dev/tools/quickbook/test/versions/versions-1_6.quickbook 2011-11-10 13:14:08 EST (Thu, 10 Nov 2011)
@@ -2,9 +2,9 @@
 [quickbook 1.6]
 ]
 
-[import templates-1_1.quickbook]
-[import templates-1_4.quickbook]
-[import templates-1_5.quickbook]
+[import templates-1_1.qbk]
+[import templates-1_4.qbk]
+[import templates-1_5.qbk]
 
 [/ This test calls a 1.4 template -> 1.5 template -> 1.4 template.
    The name lookup in the 1.4 template should skip the 1.5 template
@@ -22,6 +22,6 @@
 
 [/ For comparison]
 
-[include templates-1_1.quickbook]
-[include templates-1_4.quickbook]
-[include templates-1_5.quickbook]
+[include templates-1_1.qbk]
+[include templates-1_4.qbk]
+[include templates-1_5.qbk]


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk