[Boost-commit] svn:boost r41049 - in branches/bitten/tools: jam/src regression/src regression/xsl_reports regression/xsl_reports/xsl/v2

From: dave_at_[hidden]
Date: 2007-11-12 19:22:09

Author: dave
Date: 2007-11-12 19:22:07 EST (Mon, 12 Nov 2007)
New Revision: 41049
URL: http://svn.boost.org/trac/boost/changeset/41049

Log:
Merge in changes from trunk

Text files modified: 
   branches/bitten/tools/jam/src/build.jam                                      |     2 +-                                      
   branches/bitten/tools/jam/src/execunix.c                                     |    14 +++++++++++---                          
   branches/bitten/tools/regression/src/process_jam_log.cpp                     |    14 +++++++++++---                          
   branches/bitten/tools/regression/xsl_reports/boost_wide_report.py            |    11 +++++++----                             
   branches/bitten/tools/regression/xsl_reports/report.py                       |     4 +++-                                    
   branches/bitten/tools/regression/xsl_reports/xsl/v2/add_expected_results.xsl |     9 +++++----                               
   branches/bitten/tools/regression/xsl_reports/xsl/v2/issues_page.xsl          |     2 +-                                      
   branches/bitten/tools/regression/xsl_reports/xsl/v2/result_page.xsl          |     2 +-                                      
   8 files changed, 40 insertions(+), 18 deletions(-)

Modified: branches/bitten/tools/jam/src/build.jam
==============================================================================
--- branches/bitten/tools/jam/src/build.jam	(original)
+++ branches/bitten/tools/jam/src/build.jam	2007-11-12 19:22:07 EST (Mon, 12 Nov 2007)
@@ -175,7 +175,7 @@
     : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
 ## GCC 2.x, 3.x, 4.x
 toolset gcc gcc : "-o " : -D
-    : -pedantic
+    : -pedantic -fno-strict-aliasing
     [ opt --release : [ opt --symbols : -g : -s ] -O3 ]
     [ opt --debug : -g -O0 -fno-inline ]
     -I$(--python-include) -I$(--extra-include) -Wno-long-long

Modified: branches/bitten/tools/jam/src/execunix.c
==============================================================================
--- branches/bitten/tools/jam/src/execunix.c	(original)
+++ branches/bitten/tools/jam/src/execunix.c	2007-11-12 19:22:07 EST (Mon, 12 Nov 2007)
@@ -65,6 +65,7 @@
 static int select_timeout = 0;
 static int intr = 0;
 static int cmdsrunning = 0;
+static struct tms old_time;
 
 #define OUT 0
 #define ERR 1
@@ -110,6 +111,7 @@
         char *action,
         char *target )
 {
+        static int initialized = 0;
         int out[2], err[2];
         int slot, len;
         char *argv[ MAXARGC + 1 ];	/* +1 for NULL */
@@ -170,6 +172,12 @@
         cmdtab[ slot ].command = BJAM_MALLOC_ATOMIC(strlen(string)+1);
         strcpy(cmdtab[slot].command, string);
 
+        /* initialize only once */
+        if ( ! initialized ) {
+          times(&old_time);
+          initialized = 1;
+        }
+
         /* create pipe from child to parent */
 
         if (pipe(out) < 0)
@@ -412,7 +420,7 @@
     int rstat;
     timing_info time;
     fd_set fds;
-    struct tms old_time, new_time;
+    struct tms new_time;
 
     /* Handle naive make1() which doesn't know if cmds are running. */
 
@@ -476,8 +484,6 @@
                                 cmdtab[i].exit_reason = EXIT_FAIL;
                         }
 
-                        times(&old_time);
-
                         /* print out the rule and target name */
                         out_action(cmdtab[i].action, cmdtab[i].target,
                             cmdtab[i].command, cmdtab[i].buffer[OUT], cmdtab[i].buffer[ERR],
@@ -488,6 +494,8 @@
                         time.system = (double)(new_time.tms_cstime - old_time.tms_cstime) / CLOCKS_PER_SEC;
                         time.user = (double)(new_time.tms_cutime - old_time.tms_cutime) / CLOCKS_PER_SEC;
     
+                        old_time = new_time;
+
                         /* Drive the completion */
 
                         --cmdsrunning;

Modified: branches/bitten/tools/regression/src/process_jam_log.cpp
==============================================================================
--- branches/bitten/tools/regression/src/process_jam_log.cpp	(original)
+++ branches/bitten/tools/regression/src/process_jam_log.cpp	2007-11-12 19:22:07 EST (Mon, 12 Nov 2007)
@@ -31,7 +31,7 @@
 
 static bool echo = false;
 static bool create_dirs = false;
-static bool boost_build_v2 = false;
+static bool boost_build_v2 = true;
 
 namespace
 {
@@ -532,11 +532,14 @@
   std::ios::sync_with_stdio(false);
 
   if ( argc <= 1 )
-    std::cout << "Usage: bjam [bjam-args] | process_jam_log [--echo] [--create-directories] [--v2] [locate-root]\n"
+    std::cout << "Usage: bjam [bjam-args] | process_jam_log [--echo] [--create-directories] [--v1|v2] [locate-root]\n"
                  "locate-root         - the same as the bjam ALL_LOCATE_TARGET\n"
                  "                      parameter, if any. Default is boost-root.\n"
                  "create-directories  - if the directory for xml file doesn't exists - creates it.\n"
-                 "                      usually used for processing logfile on different machine\n";
+                 "                      usually used for processing logfile on different machine\n"
+                 "v2                  - bjam version 2 used (default).\n"
+                 "v1                  - bjam version 1 used.\n"
+                 ;
 
   boost_root = fs::initial_path();
 
@@ -577,6 +580,11 @@
     --argc; ++argv;
   }
 
+  if ( argc > 1 && std::strcmp( argv[1], "--v1" ) == 0 )
+  {
+    boost_build_v2 = false;
+    --argc; ++argv;
+  }
 
   if (argc > 1)
   {

Modified: branches/bitten/tools/regression/xsl_reports/boost_wide_report.py
==============================================================================
--- branches/bitten/tools/regression/xsl_reports/boost_wide_report.py	(original)
+++ branches/bitten/tools/regression/xsl_reports/boost_wide_report.py	2007-11-12 19:22:07 EST (Mon, 12 Nov 2007)
@@ -188,10 +188,11 @@
                 os.unlink( result )
     
 class merge_xml_action( action ):
-    def __init__( self, source, destination, expected_results_file, failures_markup_file ):
+    def __init__( self, source, destination, expected_results_file, failures_markup_file, tag ):
         action.__init__( self, destination )
         self.source_ = source
         self.destination_ = destination
+        self.tag_ = tag
         
         self.expected_results_file_ = expected_results_file
         self.failures_markup_file_  = failures_markup_file
@@ -261,6 +262,7 @@
                 , {
                     "expected_results_file" : self.expected_results_file_
                   , "failures_markup_file": self.failures_markup_file_
+                  , "source" : self.tag_ 
                   }
                 )
 
@@ -384,7 +386,7 @@
     for a in actions:
         a.run()
    
-def merge_xmls_task( source_dir, processed_dir, merged_dir, expected_results_file, failures_markup_file ):    
+def merge_xmls_task( source_dir, processed_dir, merged_dir, expected_results_file, failures_markup_file, tag ):    
     utils.log( '' )
     utils.log( 'merge_xmls_task: merging updated XMLs in "%s"...' % source_dir )
     __log__ = 1
@@ -394,7 +396,8 @@
     actions = [ merge_xml_action( os.path.join( processed_dir, os.path.basename( x ) )
                                   , x
                                   , expected_results_file
-                                  , failures_markup_file ) for x in target_files ]
+                                  , failures_markup_file 
+                                  , tag ) for x in target_files ]
 
     for a in actions:
         a.run()
@@ -487,7 +490,7 @@
         ftp_task( ftp_site, site_path, incoming_dir )
 
     unzip_archives_task( incoming_dir, processed_dir, utils.unzip )
-    merge_xmls_task( incoming_dir, processed_dir, merged_dir, expected_results_file, failures_markup_file )
+    merge_xmls_task( incoming_dir, processed_dir, merged_dir, expected_results_file, failures_markup_file, tag )
     make_links_task( merged_dir
                      , output_dir
                      , tag

Modified: branches/bitten/tools/regression/xsl_reports/report.py
==============================================================================
--- branches/bitten/tools/regression/xsl_reports/report.py	(original)
+++ branches/bitten/tools/regression/xsl_reports/report.py	2007-11-12 19:22:07 EST (Mon, 12 Nov 2007)
@@ -71,7 +71,9 @@
             , test_results_file
             , xsl_path( 'add_expected_results.xsl', v2 )
             , extended_test_results
-            , { 'expected_results_file': expected_results_file, 'failures_markup_file' : failures_markup_file }
+            , { 'expected_results_file': expected_results_file
+              , 'failures_markup_file' : failures_markup_file
+              , 'source' : tag }
             )
 
     links = os.path.join( output_dir, 'links.html' )

Modified: branches/bitten/tools/regression/xsl_reports/xsl/v2/add_expected_results.xsl
==============================================================================
--- branches/bitten/tools/regression/xsl_reports/xsl/v2/add_expected_results.xsl	(original)
+++ branches/bitten/tools/regression/xsl_reports/xsl/v2/add_expected_results.xsl	2007-11-12 19:22:07 EST (Mon, 12 Nov 2007)
@@ -23,6 +23,7 @@
       
     <xsl:param name="expected_results_file"/>
     <xsl:param name="failures_markup_file"/>
+    <xsl:param name="source"/>
     <xsl:variable name="expected_results" select="document( $expected_results_file )" />
 
     <func:function name="meta:is_test_log_complete">
@@ -168,8 +169,8 @@
                         <note>
                             <span class="auto-note">
                                 This test case was explicitly marked up in 
-                                <a href="http://cvs.sourceforge.net/viewcvs.py/boost/boost/status/explicit-failures-markup.xml">
-                                    status/explicit-failures-markup.xml</a> file in the Boost CVS as "expected to fail",
+                                <a href="http://svn.boost.org/svn/boost/{$source}/status/explicit-failures-markup.xml">
+                                    status/explicit-failures-markup.xml</a> file in the Boost SVN as "expected to fail",
                                 but is passing. Please consult the notes/output below for more details.
                             </span>
                         </note>
@@ -189,8 +190,8 @@
                                 <note>
                                     <span class="auto-note">
                                         This failure was explicitly marked as expected in 
-                                        <a href="http://cvs.sourceforge.net/viewcvs.py/boost/boost/status/explicit-failures-markup.xml">
-                                            status/explicit-failures-markup.xml</a> file in the Boost CVS. 
+                                        <a href="http://svn.boost.org/svn/boost/{$source}/status/explicit-failures-markup.xml">
+                                            status/explicit-failures-markup.xml</a> file in the Boost SVN. 
                                         Please contact the library author(s)/maintainer(s) for the explanation of this markup.
                                     </span>
                                 </note>

Modified: branches/bitten/tools/regression/xsl_reports/xsl/v2/issues_page.xsl
==============================================================================
--- branches/bitten/tools/regression/xsl_reports/xsl/v2/issues_page.xsl	(original)
+++ branches/bitten/tools/regression/xsl_reports/xsl/v2/issues_page.xsl	2007-11-12 19:22:07 EST (Mon, 12 Nov 2007)
@@ -178,7 +178,7 @@
                   <xsl:variable name="test_program"  select="$library_tests[@test-name = $test_name]/@test-program"/>
                   <tr>
                     <td class="test-name">
-                      <a href="http://cvs.sourceforge.net/viewcvs.py/*checkout*/boost/boost/{$test_program}" class="test-link" target="_top">
+                      <a href="http://svn.boost.org/svn/boost/{$source}/{$test_program}" class="test-link" target="_top">
                         <xsl:value-of select="$test_name"/>
                       </a>
                     </td>

Modified: branches/bitten/tools/regression/xsl_reports/xsl/v2/result_page.xsl
==============================================================================
--- branches/bitten/tools/regression/xsl_reports/xsl/v2/result_page.xsl	(original)
+++ branches/bitten/tools/regression/xsl_reports/xsl/v2/result_page.xsl	2007-11-12 19:22:07 EST (Mon, 12 Nov 2007)
@@ -595,7 +595,7 @@
 
         <xsl:variable name="test_header">
         <td class="test-name">
-            <a href="http://cvs.sourceforge.net/viewcvs.py/*checkout*/boost/boost/{$test_program}" class="test-link" target="_top">
+            <a href="http://svn.boost.org/svn/boost/{$source}/{$test_program}" class="test-link" target="_top">
                 <xsl:value-of select="$test_name"/>
             </a>
         </td>