[Boost-commit] svn:boost r39605 - in trunk/tools/build/v2/test: . boostbook

From: ghost_at_[hidden]
Date: 2007-09-29 14:17:30

Author: vladimir_prus
Date: 2007-09-29 14:17:27 EDT (Sat, 29 Sep 2007)
New Revision: 39605
URL: http://svn.boost.org/trac/boost/changeset/39605

Log:
Adjust boostbook test for boostbook changes. It
seems that doxygen target now produces a target
with different name, and it does not produce
any target unless there's explicit dependency
on it. I'm not sure I like the change, but
anyway.

Text files modified: 
   trunk/tools/build/v2/test/boostbook.py       |     8 +++++---                                
   trunk/tools/build/v2/test/boostbook/Jamroot  |     2 +-                                      
   trunk/tools/build/v2/test/boostbook/docs.xml |     2 +-                                      
   3 files changed, 7 insertions(+), 5 deletions(-)

Modified: trunk/tools/build/v2/test/boostbook.py
==============================================================================
--- trunk/tools/build/v2/test/boostbook.py	(original)
+++ trunk/tools/build/v2/test/boostbook.py	2007-09-29 14:17:27 EDT (Sat, 29 Sep 2007)
@@ -5,17 +5,19 @@
 # (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) 
 
 from BoostBuild import Tester, List
+import string
 
 # Create a temporary working directory
 t = Tester()
 
 t.set_tree("boostbook")
 # For some reason, the messages are sent to stderr.
-t.run_build_system(stderr="""Writing boost/A.html for refentry(boost.A)
+t.run_build_system()
+t.fail_test(string.find(t.stdout(), """Writing boost/A.html for refentry(boost.A)
 Writing library/reference.html for section(library.reference)
 Writing index.html for chapter(library)
-Writing HTML.manifest
-""")
+Writing docs_HTML.manifest
+""") == -1)
 t.expect_addition(["html/boost/A.html", "html/index.html"])
 
 t.cleanup()

Modified: trunk/tools/build/v2/test/boostbook/Jamroot
==============================================================================
--- trunk/tools/build/v2/test/boostbook/Jamroot	(original)
+++ trunk/tools/build/v2/test/boostbook/Jamroot	2007-09-29 14:17:27 EDT (Sat, 29 Sep 2007)
@@ -1,3 +1,3 @@
 
-boostbook docs : docs.xml ;
+boostbook docs : docs.xml autodoc ;
 doxygen autodoc : [ glob *.hpp ] ;

Modified: trunk/tools/build/v2/test/boostbook/docs.xml
==============================================================================
--- trunk/tools/build/v2/test/boostbook/docs.xml	(original)
+++ trunk/tools/build/v2/test/boostbook/docs.xml	2007-09-29 14:17:27 EDT (Sat, 29 Sep 2007)
@@ -32,5 +32,5 @@
     
   </section>
    
-  <xi:include href="autodoc.boostbook"/> 
+  <xi:include href="autodoc.xml"/> 
 </library>