[Boost-commit] svn:boost r39336 - in trunk/tools/jam: src test

From: grafikrobot_at_[hidden]
Date: 2007-09-16 20:54:20

Author: grafik
Date: 2007-09-16 20:54:20 EDT (Sun, 16 Sep 2007)
New Revision: 39336
URL: http://svn.boost.org/trac/boost/changeset/39336

Log:
Really fix missing INT_MAX declaration. And fix pma.jam test on Unix.
Text files modified: 
   trunk/tools/jam/src/expand.c                        |     4 ++--                                    
   trunk/tools/jam/test/parallel_multifile_actions.jam |    22 +++++++++++++++-------                  
   2 files changed, 17 insertions(+), 9 deletions(-)

Modified: trunk/tools/jam/src/expand.c
==============================================================================
--- trunk/tools/jam/src/expand.c	(original)
+++ trunk/tools/jam/src/expand.c	2007-09-16 20:54:20 EDT (Sun, 16 Sep 2007)
@@ -12,7 +12,7 @@
 # include "newstr.h"
 # include <assert.h>
 # include <stdlib.h>
-# include <stdio.h>
+# include <limits.h>
 
 # ifdef OS_CYGWIN
 #  include <sys/cygwin.h>
@@ -128,7 +128,7 @@
             at_buf = (char*)BJAM_MALLOC_ATOMIC(at_size + 1);
             at_len = var_string( in, at_buf, at_size, lol );
             at_size *= 2;
-        } while ( at_len < 0 && at_len < INT_MAX / 2 );
+        } while ( at_len < 0 && at_size < INT_MAX / 2 );
         /* Return the result as a single item list. */
         if ( at_len > 0 )
         {

Modified: trunk/tools/jam/test/parallel_multifile_actions.jam
==============================================================================
--- trunk/tools/jam/test/parallel_multifile_actions.jam	(original)
+++ trunk/tools/jam/test/parallel_multifile_actions.jam	2007-09-16 20:54:20 EDT (Sun, 16 Sep 2007)
@@ -8,22 +8,30 @@
     assert "...found 5 targets...
 ...updating 4 targets...
 .gen. g1.generated
-001 
-002 
+001
+002
 .use.1 u1.user
-003 
+003
 .use.2 u2.user
-004 
+004
 ...updated 4 targets...
 " : (==) : [ SHELL "$(ARGV[1]) -f parallel_multifile_actions.jam -sBJAM_SUBTEST=1 -j2" ] ;
 }
 else
 {
-    actions .gen. { echo 001 & sleep 1 & echo 002 }
+    actions .gen. {
+echo 001
+sleep 1
+echo 002
+}
     rule .use.1 { DEPENDS $(<) : $(>) ; }
-    actions .use.1 { echo 003 }
+    actions .use.1 {
+echo 003
+}
     rule .use.2 { DEPENDS $(<) : $(>) ; }
-    actions .use.2 { echo 004 }
+    actions .use.2 {
+echo 004
+}
 
     .gen. g1.generated g2.generated ;
     .use.1 u1.user : g1.generated ;