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

Subject: [Boost-commit] svn:boost r83589 - trunk/tools/regression/src/report
From: steven_at_[hidden]
Date: 2013-03-26 14:23:47

Author: steven_watanabe
Date: 2013-03-26 14:23:46 EDT (Tue, 26 Mar 2013)
New Revision: 83589
URL: http://svn.boost.org/trac/boost/changeset/83589

Log:
Expand ${source} in the expected results automatic note.
Text files modified: 
   trunk/tools/regression/src/report/add_expected_results.cpp |    13 ++++++++-----                           
   trunk/tools/regression/src/report/add_expected_results.hpp |     3 ++-                                     
   trunk/tools/regression/src/report/boost_report.cpp         |     2 +-                                      
   3 files changed, 11 insertions(+), 7 deletions(-)

Modified: trunk/tools/regression/src/report/add_expected_results.cpp
==============================================================================
--- trunk/tools/regression/src/report/add_expected_results.cpp	(original)
+++ trunk/tools/regression/src/report/add_expected_results.cpp	2013-03-26 14:23:46 EDT (Tue, 26 Mar 2013)
@@ -63,7 +63,8 @@
 
 void process_test_log(test_structure_t::test_log_t& test_log,
                       const failures_markup_t& failures_markup,
-                      const expected_results_t& expected_results) {
+                      const expected_results_t& expected_results,
+                      const std::string& source) {
 
     bool is_complete = is_test_log_complete(test_log);
 
@@ -149,7 +150,7 @@
     if(unexpected_success && has_explicit_markup) {
         add_note(test_log,
                  "This test case was explicitly marked up in \n"
-                 "<a href=\"http://svn.boost.org/svn/boost/{$source}/status/explicit-failures-markup.xml\">\n"
+                 "<a href=\"http://svn.boost.org/svn/boost/" + source + "/status/explicit-failures-markup.xml\">\n"
                  "    status/explicit-failures-markup.xml</a> file in the Boost SVN as \"expected to fail\",\n"
                  "but is passing. Please consult the notes/output below for more details.\n");
     }
@@ -161,7 +162,7 @@
         } else {
             add_note(test_log,
                      "This failure was explicitly marked as expected in \n"
-                     "<a href=\"http://svn.boost.org/svn/boost/{$source}/status/explicit-failures-markup.xml\">\n"
+                     "<a href=\"http://svn.boost.org/svn/boost/" + source + "/status/explicit-failures-markup.xml\">\n"
                      "status/explicit-failures-markup.xml</a> file in the Boost SVN. \n"
                      "Please contact the library author(s)/maintainer(s) for the explanation of this markup.\n");
         }
@@ -196,16 +197,18 @@
     test_log.category = category;
 }
 
+// requires: source must be an SVN branch
 void boost::regression::add_expected_results(
     test_structure_t::run_t& tests,
     const failures_markup_t& failures_markup,
-    const expected_results_t& expected_results)
+    const expected_results_t& expected_results,
+    const std::string& source)
 {
     BOOST_FOREACH(test_structure_t::toolset_group_t::reference toolset, tests.toolsets) {
         BOOST_FOREACH(test_structure_t::toolset_t::reference library, toolset.second) {
             BOOST_FOREACH(test_structure_t::library_t::reference test_case, library.second) {
                 BOOST_FOREACH(test_structure_t::test_case_t::reference test_log, test_case.second) {
-                    process_test_log(test_log, failures_markup, expected_results);
+                    process_test_log(test_log, failures_markup, expected_results, source);
                 }
             }
         }

Modified: trunk/tools/regression/src/report/add_expected_results.hpp
==============================================================================
--- trunk/tools/regression/src/report/add_expected_results.hpp	(original)
+++ trunk/tools/regression/src/report/add_expected_results.hpp	2013-03-26 14:23:46 EDT (Tue, 26 Mar 2013)
@@ -17,7 +17,8 @@
 void add_expected_results(
     test_structure_t::run_t& tests,
     const failures_markup_t& failures_markup,
-    const expected_results_t& expected_results);
+    const expected_results_t& expected_results,
+    const std::string& source);
 
 }
 }

Modified: trunk/tools/regression/src/report/boost_report.cpp
==============================================================================
--- trunk/tools/regression/src/report/boost_report.cpp	(original)
+++ trunk/tools/regression/src/report/boost_report.cpp	2013-03-26 14:23:46 EDT (Tue, 26 Mar 2013)
@@ -91,7 +91,7 @@
                     load_test_structure(&*test_results, structure, runs);
                     test_structure_t::run_t* test_run = runs.back();
                     std::cout << "Merging expected results" << std::endl;
-                    add_expected_results(*test_run, markup, expected);
+                    add_expected_results(*test_run, markup, expected, tag);
                     std::cout << "Generating links pages" << std::endl;
                     // must be run before test_results is discarded
                     if(reports.count("l"))