merge trunk

[SVN r58983]

tools/regression/build/Jamroot.jam

@@ -1,5 +1,11 @@
 # Regression test status reporting tools build Jamfile
 
+# Copyright Rene Rivera
+
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
+ 
+
 if [ glob ../../../boost-build.jam ]
 {
     use-project /boost : ../../.. ;

tools/regression/doc/index.html

@@ -33,7 +33,7 @@
     <li><a href="../src/compiler_status.cpp">compiler_status.cpp</a> -
     Generates HTML status tables from test_log.xml and other files.</li>
 
-    <li><a href="../build/Jamfile.v2">Jamfile.v2</a> - Builds process_jam_log
+    <li><a href="../build/Jamroot.jam">Jamroot.jam</a> - Builds process_jam_log
     and compiler_status executables.</li>
 
     <li><a href="library_status.html">Library Status</a> - Runs test programs

tools/regression/src/compiler_status.cpp

@@ -410,15 +410,21 @@ const fs::path find_bin_path(const string& relative)
     // compile msgs sometimes modified, so make a local copy
     string compile( ((pass && no_warn)
       ? empty_string :  element_content( db, "compile" )) );
-
     const string & link( pass ? empty_string : element_content( db, "link" ) );
     const string & run( (pass && !always_show_run_output)
       ? empty_string : element_content( db, "run" ) );
     string lib( (pass ? empty_string : element_content( db, "lib" )) );
 
+    string::size_type pos;
+    if ( (pos = compile.find("30 DAY EVALUATION LICENSE")) != string::npos )
+    {
+      compile.erase(pos, 25);
+      while ( compile[0] == '\n' || compile[0] == '\r' ) compile.erase(0,1);
+    }
+
     // some compilers output the filename even if there are no errors or
     // warnings; detect this if one line of output and it contains no space.
-    string::size_type pos = compile.find( '\n', 1 );
+    pos = compile.find( '\n', 1 );
     if ( pos != string::npos && compile.size()-pos <= 2
         && compile.find( ' ' ) == string::npos ) compile.clear();
 

tools/regression/src/detail/tiny_xml_test.txt

@@ -1,4 +1,9 @@
 <root>
+<frontmatter>
+//  (C) Copyright Beman Dawes 2002.  Distributed under the Boost
+//  Software License, Version 1.0. (See accompanying file
+//  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+</frontmatter>
 <element-1 at-1="abcd" at-2 = "defg" >
 <element-1a>
 It's Howdy Doody time!

tools/regression/src/library_test.bat

@@ -1,4 +1,10 @@
 @echo off
+
+rem Copyright Robert Ramey 2007
+
+rem Distributed under the Boost Software License, Version 1.0.
+rem See http://www.boost.org/LICENSE_1_0.txt
+
 if not "%1" == "" goto bjam
     echo Usage: %0 "<bjam arguments>"
     echo where typical bjam arguements are:

tools/regression/src/library_test.sh

@@ -1,3 +1,8 @@
+# Copyright Robert Ramey 2007
+
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
+
 if test $# -eq 0 
 then
     echo "Usage: $0 <bjam arguments>"

tools/regression/src/regression.py

@@ -329,13 +329,13 @@ class runner:
     def command_test_run(self):
         self.import_utils()
         if self.pjl_toolset != 'python':
-            test_cmd = '%s -d2 --dump-tests %s "--build-dir=%s" >>"%s" 2>&1' % (
+            test_cmd = '%s -d2 preserve-test-targets=off --dump-tests %s "--build-dir=%s" >>"%s" 2>&1' % (
                 self.bjam_cmd( self.toolsets ),
                 self.bjam_options,
                 self.regression_results,
                 self.regression_log )
         else:
-            test_cmd = '%s -d1 --dump-tests --verbose-test %s "--build-dir=%s" "--out-xml=%s"' % (
+            test_cmd = '%s -d1 preserve-test-targets=off --dump-tests --verbose-test %s "--build-dir=%s" "--out-xml=%s"' % (
                 self.bjam_cmd( self.toolsets ),
                 self.bjam_options,
                 self.regression_results,

tools/regression/src/run_tests.sh

@@ -1,5 +1,11 @@
 #!/bin/sh
 #
+# Copyright John Maddock
+# Copyright Rene Rivera
+#
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
+#
 # shell script for running the boost regression test suite and generating
 # a html table of results.
 

tools/regression/test/Jamfile.v2

@@ -1,21 +1,28 @@
+# Copyright Misha Bergal 2006
+#
+# Distributed under the Boost Software License, Version 1.0.
+# See http://www.boost.org/LICENSE_1_0.txt
+
 test-suite testlib :
-    [ compile-fail compile-fail~fail.cpp ]
-    [ compile-fail compile-fail~pass.cpp ]
-    [ compile compile~fail.cpp  ]
-    [ compile compile~pass.cpp  ]
-    [ compile compile~warn.cpp  ]
-    [ link link~fail.cpp ]
-    [ link link~pass.cpp ]
-    [ link-fail link-fail~fail.cpp ]
-    [ link-fail link-fail~pass.cpp ]
-    [ run-fail run-fail~compile-fail.cpp ]
-    [ run-fail run-fail~fail-warn.cpp ]
-    [ run-fail run-fail~fail.cpp ]
-    [ run-fail run-fail~pass.cpp ]
-    [ run run~fail.cpp ]
-    [ run run~note.cpp ]
-    [ run run~pass.cpp ]
-    [ run run~warn-note.cpp ]
-    [ run run~warn.cpp ]
+    [ compile-fail compile-fail_fail.cpp ]
+    [ compile-fail compile-fail_pass.cpp ]
+    [ compile compile_fail.cpp  ]
+    [ compile compile_pass.cpp  ]
+    [ compile compile_warn.cpp  ]
+#  The link test .cpp files were apparently never committed to the repository,
+#  and were lost.   
+#    [ link link_fail.cpp ]
+#    [ link link_pass.cpp ]
+#    [ link-fail link-fail_fail.cpp ]
+#    [ link-fail link-fail_pass.cpp ]
+    [ run-fail run-fail_compile-fail.cpp ]
+    [ run-fail run-fail_fail-warn.cpp ]
+    [ run-fail run-fail_fail.cpp ]
+    [ run-fail run-fail_pass.cpp ]
+    [ run run_fail.cpp ]
+    [ run run_note.cpp ]
+    [ run run_pass.cpp ]
+    [ run run_warn-note.cpp ]
+    [ run run_warn.cpp ]
 
     ;

tools/regression/test/test.bat

@@ -1,4 +1,9 @@
-set TEST_LOCATE_ROOT=d:\temp
+rem Copyright Beman Dawes 2005
+
+rem Distributed under the Boost Software License, Version 1.0.
+rem See http://www.boost.org/LICENSE_1_0.txt
+
+set TEST_LOCATE_ROOT=%TEMP%
 
 echo Begin test processing...
 bjam --dump-tests "-sALL_LOCATE_TARGET=%TEST_LOCATE_ROOT%" %* >bjam.log 2>&1

tools/regression/xsl_reports/README.txt

@@ -0,0 +1,27 @@
+
+
+This folder keeps scripts the produce the Boost regression test tables.
+
+The entry point is the boost_wide_report.py script. In the simplest
+case, it should be run as:
+
+     python boost_wide_report.py 
+           --locate-root=XXX  
+           --results-dir=YYY
+           --tag trunk
+           --expected-results=XXX
+           --failures-markup=XXX 
+
+The 'trunk' is the tag of things that are tested, and should match the
+directory name on the server keeping uploaded individual results.
+'results-dir' is a directory where individual results (zip files) will
+be downloaded, and then processed. expected-results and failures-markup
+should be paths to corresponding files in 'status' subdir of boost tree.
+locate-root should point at boost root, it's unclear if it of any use
+now.
+
+This will download and process *all* test results, but it will not
+upload them, so good for local testing. It's possible to run
+this command, interrupt it while it processes results, leave just
+a few .zip files in result dir, and then re-run with --dont-collect-logs
+option, to use downloaded zips only.