[Boost-commit] svn:boost r45125 - trunk/tools/regression/src

From: markus.schoepflin_at_[hidden]
Date: 2008-05-05 04:16:21

Author: schoepflin
Date: 2008-05-05 04:16:21 EDT (Mon, 05 May 2008)
New Revision: 45125
URL: http://svn.boost.org/trac/boost/changeset/45125

Log:
Removed use of conditional expressions, as this is only available in Python 2.5 and later.
Text files modified: 
   trunk/tools/regression/src/regression.py |    15 +++++++++------                         
   1 files changed, 9 insertions(+), 6 deletions(-)

Modified: trunk/tools/regression/src/regression.py
==============================================================================
--- trunk/tools/regression/src/regression.py	(original)
+++ trunk/tools/regression/src/regression.py	2008-05-05 04:16:21 EDT (Mon, 05 May 2008)
@@ -363,11 +363,6 @@
             f.write( '<p>Tests are run on %s platform.</p>' % self.platform_name() )
             f.close()
 
-        if self.incremental:
-            run_type = 'incremental'
-        else:
-            run_type = 'full'
-
         source = 'tarball'
         revision = ''
         svn_root_file = os.path.join( self.boost_root, '.svn' )
@@ -390,6 +385,10 @@
 
         if self.pjl_toolset != 'python':
             from collect_and_upload_logs import collect_logs
+            if self.incremental:
+                run_type = 'incremental'
+            else:
+                run_type = 'full'
             collect_logs(
                 self.regression_results,
                 self.runner, self.tag, self.platform, comment_path,
@@ -400,6 +399,10 @@
                 revision )
         else:
             from process_jam_log import BJamLog2Results
+            if self.incremental:
+                run_type = '--incremental'
+            else:
+                run_type = ''
             BJamLog2Results([
                 '--output='+os.path.join(self.regression_results,self.runner+'.xml'),
                 '--runner='+self.runner,
@@ -408,7 +411,7 @@
                 '--platform='+self.platform,
                 '--source='+source,
                 '--revision='+revision,
-                '--incremental' if run_type == 'incremental' else '',
+                run_type,
                 self.regression_log
                 ])
             self.compress_file(