[Boost-commit] svn:boost r41382 - branches/bitten/tools/regression/src

From: dave_at_[hidden]
Date: 2007-11-25 15:26:30

Author: dave
Date: 2007-11-25 15:26:29 EST (Sun, 25 Nov 2007)
New Revision: 41382
URL: http://svn.boost.org/trac/boost/changeset/41382

Log:
Change recipe to use boost.bjam_options and boost.bjam_build_options

Text files modified: 
   branches/bitten/tools/regression/src/recipe.py     |     6 +++---                                  
   branches/bitten/tools/regression/src/regression.py |     8 ++++++--                                
   2 files changed, 9 insertions(+), 5 deletions(-)

Modified: branches/bitten/tools/regression/src/recipe.py
==============================================================================
--- branches/bitten/tools/regression/src/recipe.py	(original)
+++ branches/bitten/tools/regression/src/recipe.py	2007-11-25 15:26:29 EST (Sun, 25 Nov 2007)
@@ -179,13 +179,13 @@
     revision="HEAD" />
   </step>
 
-  <step id="build tools" description="Build regression testing tools">
-    <python:exec file="tools/regression/src/run.py" args="--incremental --debug-level=10 --bjam-options=-j${boost.parallelism} ${boost.tool-build-options} setup" />
+  <step id="build tools" description="Build bjam">
+    <python:exec file="tools/regression/src/run.py" args="--incremental --debug-level=10 &quot;${boost.bjam_build_options}&quot; setup" />
   </step>
   '''
 project_xml ='''                                                     
   <step id="%(id)s" description="Tests run in %(project_path)s" onerror="continue">
-    <python:exec file="tools/regression/src/run.py" args="--incremental --library=%(project_path)s --bjam-options=-j${boost.parallelism} --reflect-test-status --bitten-report=results/%(project_path)s.xml test-run create-bitten-report" />
+    <python:exec file="tools/regression/src/run.py" args="--incremental --library=%(project_path)s &quot;--bjam-options=${boost.bjam_options}&quot; --reflect-test-status --bitten-report=results/%(project_path)s.xml test-run create-bitten-report" />
     <report category="test" file="results/%(project_path)s.xml" />
   </step>
 '''

Modified: branches/bitten/tools/regression/src/regression.py
==============================================================================
--- branches/bitten/tools/regression/src/regression.py	(original)
+++ branches/bitten/tools/regression/src/regression.py	2007-11-25 15:26:29 EST (Sun, 25 Nov 2007)
@@ -173,6 +173,8 @@
         self.boost_build_use_xml = ('create-bitten-report' in self.actions and
                                     'test-process' not in self.actions)
 
+        self.dev_null = {'nt':'nul','posix':'/dev/null'}[os.name]
+        
         if self.debug_level > 0:
             self.log('Regression root =     %s'%self.regression_root)
             self.log('Boost root =          %s'%self.boost_root)
@@ -297,11 +299,13 @@
         
         utils.makedirs( os.path.split(self.out_xml)[0] )
 
-        test_cmd = '%s --dump-tests %s --out-xml=%s "--build-dir=%s"' % (
+        test_cmd = '%s --dump-tests %s --out-xml=%s "--build-dir=%s">%s 2>&1' % (
             self.bjam_cmd( self.toolsets ),
             self.bjam_options,
             self.out_xml,
-            self.regression_results)
+            self.regression_results,
+            self.dev_null
+            )
         
         self.log( 'Starting tests (%s)...' % test_cmd )
         cd = os.getcwd()