[Boost-commit] svn:boost r66705 - trunk/tools/build/v2/engine/src

Subject: [Boost-commit] svn:boost r66705 - trunk/tools/build/v2/engine/src
From: kbelco_at_[hidden]
Date: 2010-11-23 17:01:36

Author: noel_belcourt
Date: 2010-11-23 17:01:27 EST (Tue, 23 Nov 2010)
New Revision: 66705
URL: http://svn.boost.org/trac/boost/changeset/66705

Log:
Set bjam timeout to maximum of -l options on command line.

Patch to ensure that maximum value is selected when there's
multiple -l timeout options.

Text files modified: 
   trunk/tools/build/v2/engine/src/jam.c |     7 +++++--                                 
   1 files changed, 5 insertions(+), 2 deletions(-)

Modified: trunk/tools/build/v2/engine/src/jam.c
==============================================================================
--- trunk/tools/build/v2/engine/src/jam.c	(original)
+++ trunk/tools/build/v2/engine/src/jam.c	2010-11-23 17:01:27 EST (Tue, 23 Nov 2010)
@@ -302,8 +302,11 @@
     if ( ( s = getoptval( optv, 'g', 0 ) ) )
         globs.newestfirst = 1;
 
-    if ( ( s = getoptval( optv, 'l', 0 ) ) )
-        globs.timeout = atoi( s );
+    /* check for and use maximum value of timeout parameter */
+    for ( n = 0; ( s = getoptval( optv, 'l', n ) ); ++n ) {
+      int t = atoi( s );
+      globs.timeout = globs.timeout < t ? t : globs.timeout;
+    }
 
     /* Turn on/off debugging */
     for ( n = 0; ( s = getoptval( optv, 'd', n ) ); ++n )