[Boost-commit] svn:boost r69823 - in trunk/tools/quickbook: . test test/src

Subject: [Boost-commit] svn:boost r69823 - in trunk/tools/quickbook: . test test/src
From: dnljms_at_[hidden]
Date: 2011-03-10 13:41:22

Author: danieljames
Date: 2011-03-10 13:41:20 EST (Thu, 10 Mar 2011)
New Revision: 69823
URL: http://svn.boost.org/trac/boost/changeset/69823

Log:
Cherry pick quickbook test improvements.

- Encode the full paths into `quickbook-testing.jam` so it can be used from
  other locations.
- Turn off debug symbols on Visual C++, they cause the build system to do
  something odd to the tests.

Added:
   trunk/tools/quickbook/test/src/Jamfile.v2
      - copied unchanged from r68875, /branches/quickbook-filenames/tools/quickbook/test/src/Jamfile.v2
Properties modified: 
   trunk/tools/quickbook/   (props changed)
Text files modified: 
   trunk/tools/quickbook/test/Jamfile.v2            |     5 ++++-                                   
   trunk/tools/quickbook/test/quickbook-testing.jam |    14 ++++++++------                          
   2 files changed, 12 insertions(+), 7 deletions(-)

Modified: trunk/tools/quickbook/test/Jamfile.v2
==============================================================================
--- trunk/tools/quickbook/test/Jamfile.v2	(original)
+++ trunk/tools/quickbook/test/Jamfile.v2	2011-03-10 13:41:20 EST (Thu, 10 Mar 2011)
@@ -6,7 +6,10 @@
 #   http://www.boost.org/LICENSE_1_0.txt)
 #
 
-project test ;
+project test
+    : requirements
+        <toolset>msvc:<debug-symbols>off
+    ;
 
 import quickbook-testing : quickbook-test quickbook-fail-test ;
 

Modified: trunk/tools/quickbook/test/quickbook-testing.jam
==============================================================================
--- trunk/tools/quickbook/test/quickbook-testing.jam	(original)
+++ trunk/tools/quickbook/test/quickbook-testing.jam	2011-03-10 13:41:20 EST (Thu, 10 Mar 2011)
@@ -24,8 +24,6 @@
 generators.register-standard quickbook-testing.process-quickbook : QUICKBOOK_INPUT : QUICKBOOK_OUTPUT ;
 
 ################################################################################
-exe line-compare-tool : src/text_diff.cpp ;
-
 #
 #   quickbook-test - generates a test for quickbook itself. A quickbook-test is
 #   actually made up of two tests:
@@ -43,6 +41,8 @@
 
     local project = [ project.current ] ;
 
+    local boost-root = [ modules.peek : BOOST_ROOT ] ;
+
     local t =
         [ targets.create-typed-target QUICKBOOK_OUTPUT
             : $(project)
@@ -50,13 +50,13 @@
             : $(input)
             : $(requirements)
                 <location-prefix>$(target-name).test
-                <quickbook-testing.quickbook-command>../src//quickbook
+                <quickbook-testing.quickbook-command>$(boost-root)/tools/quickbook/src//quickbook
         ]
 
         [ targets.create-typed-target RUN
             : $(project)
             : $(target-name)
-            : .//line-compare-tool
+            : $(boost-root)/tools/quickbook/test/src//line-compare-tool
             : $(requirements)
                 <location-prefix>$(target-name).test
                 <testing.input-file>$(reference-output)
@@ -75,14 +75,16 @@
     input ?= $(target-name).quickbook ;
 
     local project = [ project.current ] ;
-    requirements += <testing.arg>$(input:J=" ") ;
+    
+    local boost-root = [ modules.peek : BOOST_ROOT ] ;
 
     local t =
         [ targets.create-typed-target RUN_FAIL
             : $(project)
             : $(target-name)
-            : ../src//quickbook
+            : $(boost-root)/tools/quickbook/src//quickbook
             : $(requirements)
+              <testing.input-file>$(input)
               <preserve-test-targets>on
               <dependency>$(input)
         ]