Index: tools/regression/xsl_reports/xsl/v2/result_page.xsl
===================================================================
--- tools/regression/xsl_reports/xsl/v2/result_page.xsl (revision 86135)
+++ tools/regression/xsl_reports/xsl/v2/result_page.xsl (working copy)
@@ -460,38 +460,53 @@
-
-
-
-
-
-
-
-
-
-
-
- fail?
-
-
- fail*
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ fail?
+
+
+ fail*
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: tools/regression/xsl_reports/xsl/v2/common.xsl
===================================================================
--- tools/regression/xsl_reports/xsl/v2/common.xsl (revision 86135)
+++ tools/regression/xsl_reports/xsl/v2/common.xsl (working copy)
@@ -114,14 +114,25 @@
-
- unusable
-
- fail-unexpected
+
+
+ unusable
+
+
+ fail-unexpected
+
+
- fail-unexpected-new
+
+
+ unusable
+
+
+ fail-unexpected-new
+
+
success-unexpected
@@ -297,7 +308,14 @@
- unusable
+
+
+ unusable
+
+
+ success-unexpected
+
+
Index: tools/regression/xsl_reports/xsl/v2/summary_page.xsl
===================================================================
--- tools/regression/xsl_reports/xsl/v2/summary_page.xsl (revision 86135)
+++ tools/regression/xsl_reports/xsl/v2/summary_page.xsl (working copy)
@@ -74,7 +74,9 @@
+
+
@@ -147,13 +149,37 @@
- Unusable:
+ Total result --
+
+ Passes:
|
+ New passes:
+
+ New failures:
+ |
Regressions:
|
- New failures:
+ Unusable:
+
+ Separate result (by compiler release) --
+
+
+
+ :
+
+ Passes#:
+ |
+ New passes#:
+
+ New failures#:
+ |
+ Regressions#:
+ |
+ Unusable#:
+
+
-
+
@@ -290,7 +316,12 @@
n/a
-
+
+
+
+
+
+ %
@@ -305,7 +336,12 @@
fail
-
+
+
+
+
+
+ %
OK
Index: tools/regression/src/report/result_page.cpp
===================================================================
--- tools/regression/src/report/result_page.cpp (revision 86135)
+++ tools/regression/src/report/result_page.cpp (working copy)
@@ -97,20 +97,26 @@
document << "\n";
- if(is_unusable(explicit_markup, library, toolset)) {
- insert_cell_link(document, "n/a", cell_link);
- } else if(test_logs.empty()) {
+ if (test_logs.empty()) {
document << " \n";
} else {
BOOST_FOREACH(test_log_group_t::value_type log, test_logs) {
if(!log->result && log->status) {
- insert_cell_link(document, (log->expected_reason != "")? "fail?" : "fail*", cell_link);
+ if (is_unusable(explicit_markup, library, toolset)) {
+ insert_cell_link(document, "n/a", cell_link);
+ } else {
+ insert_cell_link(document, (log->expected_reason != "")? "fail?" : "fail*", cell_link);
+ }
goto done;
}
}
BOOST_FOREACH(test_log_group_t::value_type log, test_logs) {
if(!log->result && !log->status) {
- insert_cell_link(document, "fail", cell_link);
+ if (is_unusable(explicit_markup, library, toolset)) {
+ insert_cell_link(document, "n/a", cell_link);
+ } else {
+ insert_cell_link(document, "fail", cell_link);
+ }
goto done;
}
}
Index: tools/regression/src/report/common.cpp
===================================================================
--- tools/regression/src/report/common.cpp (revision 86135)
+++ tools/regression/src/report/common.cpp (working copy)
@@ -57,14 +57,25 @@
-
- unusable
-
- fail-unexpected
+
+
+ unusable
+
+
+ fail-unexpected
+
+
- fail-unexpected-new
+
+
+ unusable
+
+
+ fail-unexpected-new
+
+
success-unexpected
@@ -306,8 +317,18 @@
const std::string& library,
const std::string& toolset,
const test_log_group_t& test_logs) {
+ bool failed = false;
+ BOOST_FOREACH(test_log_group_t::value_type log, test_logs) {
+ if(!log->result) {
+ failed = true;
+ }
+ }
if(is_unusable(explicit_markup, library, toolset)) {
- return "unusable";
+ if (failed) {
+ return "unusable";
+ } else {
+ return "success-unexpected";
+ }
}
if(test_logs.empty()) {
return "missing";
@@ -327,10 +348,8 @@
return "fail-expected-unreasearched";
}
}
- BOOST_FOREACH(test_log_group_t::value_type log, test_logs) {
- if(!log->result) {
- return "fail-expected";
- }
+ if (failed) {
+ return "failed-expected";
}
BOOST_FOREACH(test_log_group_t::value_type log, test_logs) {
if(log->result && !log->expected_result) {
| |