[Boost-commit] svn:boost r39625 - in branches/build/Milestone_12/build/v2: . example/customization test test/boostbook

From: ghost_at_[hidden]
Date: 2007-09-30 15:08:00

Author: vladimir_prus
Date: 2007-09-30 15:07:59 EDT (Sun, 30 Sep 2007)
New Revision: 39625
URL: http://svn.boost.org/trac/boost/changeset/39625

Log:
Merge test fixes from trunk
Properties modified: 
   branches/build/Milestone_12/build/v2/example/customization/inline_file.py   (props changed)
Text files modified: 
   branches/build/Milestone_12/build/v2/roll.sh                      |     4 ++--                                    
   branches/build/Milestone_12/build/v2/test/boostbook.py            |     8 +++++---                                
   branches/build/Milestone_12/build/v2/test/boostbook/Jamroot       |     2 +-                                      
   branches/build/Milestone_12/build/v2/test/boostbook/docs.xml      |     2 +-                                      
   branches/build/Milestone_12/build/v2/test/example_qt4.py          |     6 +++---                                  
   branches/build/Milestone_12/build/v2/test/test-config-example.jam |     4 ++--                                    
   6 files changed, 14 insertions(+), 12 deletions(-)

Modified: branches/build/Milestone_12/build/v2/roll.sh
==============================================================================
--- branches/build/Milestone_12/build/v2/roll.sh	(original)
+++ branches/build/Milestone_12/build/v2/roll.sh	2007-09-30 15:07:59 EDT (Sun, 30 Sep 2007)
@@ -32,8 +32,8 @@
 touch doc/project-root.jam
 export BOOST_BUILD_PATH=/home/ghost/Work/boost-rc/tools/build/v2
 cd doc
-/home/ghost/Work/boost-rc/tools/jam/src/bin.linuxx86/bjam --v2
-/home/ghost/Work/boost-rc/tools/jam/src/bin.linuxx86/bjam --v2 pdf
+/home/ghost/Work/Boost/boost-svn/tools/jam/src/bin.linuxx86/bjam --v2
+/home/ghost/Work/Boost/boost-svn/tools/jam/src/bin.linuxx86/bjam --v2 pdf
 cp `find bin -name "*.pdf"` ../..
 mv ../../standalone.pdf ../../userman.pdf
 rm -rf bin

Modified: branches/build/Milestone_12/build/v2/test/boostbook.py
==============================================================================
--- branches/build/Milestone_12/build/v2/test/boostbook.py	(original)
+++ branches/build/Milestone_12/build/v2/test/boostbook.py	2007-09-30 15:07:59 EDT (Sun, 30 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: branches/build/Milestone_12/build/v2/test/boostbook/Jamroot
==============================================================================
--- branches/build/Milestone_12/build/v2/test/boostbook/Jamroot	(original)
+++ branches/build/Milestone_12/build/v2/test/boostbook/Jamroot	2007-09-30 15:07:59 EDT (Sun, 30 Sep 2007)
@@ -1,3 +1,3 @@
 
-boostbook docs : docs.xml ;
+boostbook docs : docs.xml autodoc ;
 doxygen autodoc : [ glob *.hpp ] ;

Modified: branches/build/Milestone_12/build/v2/test/boostbook/docs.xml
==============================================================================
--- branches/build/Milestone_12/build/v2/test/boostbook/docs.xml	(original)
+++ branches/build/Milestone_12/build/v2/test/boostbook/docs.xml	2007-09-30 15:07:59 EDT (Sun, 30 Sep 2007)
@@ -32,5 +32,5 @@
     
   </section>
    
-  <xi:include href="autodoc.boostbook"/> 
+  <xi:include href="autodoc.xml"/> 
 </library>

Modified: branches/build/Milestone_12/build/v2/test/example_qt4.py
==============================================================================
--- branches/build/Milestone_12/build/v2/test/example_qt4.py	(original)
+++ branches/build/Milestone_12/build/v2/test/example_qt4.py	2007-09-30 15:07:59 EDT (Sun, 30 Sep 2007)
@@ -13,14 +13,14 @@
 
 t.set_tree("../example/qt/qt4/hello")
 t.run_build_system()
-t.expect_addition(["bin/$toolset/debug/arrow"])
+t.expect_addition(["bin/$toolset/debug/threading-multi/user-interface-gui/arrow"])
 
 t.set_tree("../example/qt/qt4/moccable-cpp")
 t.run_build_system()
-t.expect_addition(["bin/$toolset/debug/main"])
+t.expect_addition(["bin/$toolset/debug/threading-multi/user-interface-gui/main"])
 
 t.set_tree("../example/qt/qt4/uic")
 t.run_build_system()
-t.expect_addition(["bin/$toolset/debug/hello"])
+t.expect_addition(["bin/$toolset/debug/threading-multi/user-interface-gui/hello"])
 
 t.cleanup()

Modified: branches/build/Milestone_12/build/v2/test/test-config-example.jam
==============================================================================
--- branches/build/Milestone_12/build/v2/test/test-config-example.jam	(original)
+++ branches/build/Milestone_12/build/v2/test/test-config-example.jam	2007-09-30 15:07:59 EDT (Sun, 30 Sep 2007)
@@ -9,11 +9,11 @@
 # while site-config.jam and user-config.jam will be ignored.
 
 using gcc ;
-using borland ;
 
 using boostbook 
      : /home/ghost/Store/docbook/xsl
      : /home/ghost/Store/docbook/dtd
-     : /home/ghost/Work/boost-rc/tools/boostbook
+     : /home/ghost/Work/Boost/boost-svn/tools/boostbook
      ; 
 using doxygen ;
+using qt4 : /usr/share/qt ;