diff options
| author | Peter Andersson <[email protected]> | 2014-06-16 14:58:40 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2014-06-16 14:59:51 +0200 |
| commit | a1cf2dfb9382402a6e85e1e8367ba918eb722c6b (patch) | |
| tree | 591fe6609a8c03321d171a870df9ef026b16cb16 | |
| parent | 2f1b2e8e946e28f9b18b3abd136913a9a2cbe447 (diff) | |
| parent | 499915f267e3d521905eb8edd0b602d9ffd73022 (diff) | |
| download | otp-a1cf2dfb9382402a6e85e1e8367ba918eb722c6b.tar.gz otp-a1cf2dfb9382402a6e85e1e8367ba918eb722c6b.tar.bz2 otp-a1cf2dfb9382402a6e85e1e8367ba918eb722c6b.zip | |
Merge branch 'peppe/common_test/ct_basic_html_error' into maint
* peppe/common_test/ct_basic_html_error:
Fix problem with mismatching html tags when running basic_html log mode
OTP-11917
| -rw-r--r-- | lib/common_test/src/ct_logs.erl | 10 | ||||
| -rw-r--r-- | lib/test_server/src/test_server_ctrl.erl | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl index e29c01a694..43eabb18d5 100644 --- a/lib/common_test/src/ct_logs.erl +++ b/lib/common_test/src/ct_logs.erl @@ -1305,7 +1305,8 @@ total_row(Success, Fail, UserSkip, AutoSkip, NotBuilt, All) -> "<td align=right>",integer_to_list(AllSkip), " (",UserSkipStr,"/",AutoSkipStr,")</td>\n", "<td align=right><b>",integer_to_list(NotBuilt),"<b></td>\n", - AllInfo, "</tr>\n</tfoot>\n"]. + AllInfo, "</tr>\n", + xhtml("","</tfoot>\n")]. not_built(_BaseName,_LogDir,_All,[]) -> 0; @@ -1533,7 +1534,8 @@ all_suites_index_footer() -> xhtml("<br><br>\n", "<br /><br />\n") | footer()]. all_runs_index_footer() -> - ["</tbody>\n</table>\n", + [xhtml("", "</tbody>\n"), + "</table>\n", "</center>\n", xhtml("<br><br>\n", "<br /><br />\n") | footer()]. @@ -1690,7 +1692,7 @@ config_table(Vars) -> config_table_header() -> [ xhtml(["<h2>Configuration</h2>\n" - "<table border=\"3\" cellpadding=\"5\" bgcolor=\"",?table_color1,"\"\n"], + "<table border=\"3\" cellpadding=\"5\" bgcolor=\"",?table_color1,"\">\n"], ["<h4>CONFIGURATION</h4>\n", "<table id=\"",?sortable_table_name,"\">\n", "<thead>\n"]), @@ -1706,7 +1708,7 @@ config_table1([{Key,Value}|Vars]) -> "<td>", io_lib:format("~p",[Value]), "</td>\n</tr>\n"]) | config_table1(Vars)]; config_table1([]) -> - ["</tbody>\n</table>\n"]. + [xhtml("","</tbody>\n"),"</table>\n"]. make_all_runs_index(When) -> diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl index c3550d4533..af8921fe75 100644 --- a/lib/test_server/src/test_server_ctrl.erl +++ b/lib/test_server/src/test_server_ctrl.erl @@ -1601,7 +1601,8 @@ do_test_cases(TopCases, SkipCases, [?suitelog_name,CoverLog,?unexpected_io_log]), print(html, "<p>~ts</p>\n" ++ - xhtml("<table bgcolor=\"white\" border=\"3\" cellpadding=\"5\">", + xhtml(["<table bgcolor=\"white\" border=\"3\" cellpadding=\"5\">\n", + "<thead>\n"], ["<table id=\"",?sortable_table_name,"\">\n", "<thead>\n"]) ++ "<tr><th>Num</th><th>Module</th><th>Group</th>" ++ |