diff options
| author | Peter Andersson <[email protected]> | 2014-06-03 16:35:36 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2014-06-03 16:35:36 +0200 |
| commit | 499915f267e3d521905eb8edd0b602d9ffd73022 (patch) | |
| tree | b02f698cc18b310b35d1dc68b0adda86211839d8 | |
| parent | a4dac83e01f7f74ccad5ee1f81bdb12808e2d9e0 (diff) | |
| download | otp-499915f267e3d521905eb8edd0b602d9ffd73022.tar.gz otp-499915f267e3d521905eb8edd0b602d9ffd73022.tar.bz2 otp-499915f267e3d521905eb8edd0b602d9ffd73022.zip | |
Fix problem with mismatching html tags when running basic_html log mode
| -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 a4ad65c0a4..6fc8f9f3b9 100644 --- a/lib/common_test/src/ct_logs.erl +++ b/lib/common_test/src/ct_logs.erl @@ -1304,7 +1304,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; @@ -1519,7 +1520,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()]. @@ -1676,7 +1678,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"]), @@ -1692,7 +1694,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 5fbc47a813..65aa65af37 100644 --- a/lib/test_server/src/test_server_ctrl.erl +++ b/lib/test_server/src/test_server_ctrl.erl @@ -1578,7 +1578,8 @@ do_test_cases(TopCases, SkipCases, [?suitelog_name,?coverlog_name,?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>" ++ |