diff options
| author | Peter Andersson <[email protected]> | 2012-03-26 13:39:04 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-03-26 13:39:18 +0200 |
| commit | 22c4c386fe2a8655b1c9be09a083b89e220f1120 (patch) | |
| tree | ebb9a6249a20854426e23957c61de9f45e8b7100 /lib/common_test/src/ct_logs.erl | |
| parent | 688386c48dc55b38da1ce55e2db236f6da86cdde (diff) | |
| parent | 390843117229d7d6e1e5f167aca9ea2ebe6df5f2 (diff) | |
| download | otp-22c4c386fe2a8655b1c9be09a083b89e220f1120.tar.gz otp-22c4c386fe2a8655b1c9be09a083b89e220f1120.tar.bz2 otp-22c4c386fe2a8655b1c9be09a083b89e220f1120.zip | |
Merge remote branch 'origin/peppe/common_test/otp-9973' into maint
* origin/peppe/common_test/otp-9973:
Update ct_master to use the Common Test CSS file for the logs
OTP-9973
Diffstat (limited to 'lib/common_test/src/ct_logs.erl')
| -rw-r--r-- | lib/common_test/src/ct_logs.erl | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl index 0cd9b5f7cb..012f947fdd 100644 --- a/lib/common_test/src/ct_logs.erl +++ b/lib/common_test/src/ct_logs.erl @@ -36,6 +36,7 @@ -export([make_last_run_index/0]). -export([make_all_suites_index/1,make_all_runs_index/1]). -export([get_ts_html_wrapper/3]). +-export([xhtml/2, locate_default_css_file/0, make_relative/1]). %% Logging stuff directly from testcase -export([tc_log/3,tc_log/4,tc_log_async/3,tc_print/3,tc_pal/3,ct_log/3, @@ -1246,18 +1247,18 @@ header1(Title, SubTitle) -> ["<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n", "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n", "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n"]), - "<!-- autogenerated by '"++atom_to_list(?MODULE)++"' -->\n", - "<head>\n", - "<title>" ++ Title ++ " " ++ SubTitle ++ "</title>\n", - "<meta http-equiv=\"cache-control\" content=\"no-cache\">\n", - xhtml("", - ["<link rel=\"stylesheet\" href=\"",CSSFile,"\" type=\"text/css\">"]), - "</head>\n", - body_tag(), - "<center>\n", - "<h1>" ++ Title ++ "</h1>\n", - "</center>\n", - SubTitleHTML,"\n"]. + "<!-- autogenerated by '"++atom_to_list(?MODULE)++"' -->\n", + "<head>\n", + "<title>" ++ Title ++ " " ++ SubTitle ++ "</title>\n", + "<meta http-equiv=\"cache-control\" content=\"no-cache\">\n", + xhtml("", + ["<link rel=\"stylesheet\" href=\"",CSSFile,"\" type=\"text/css\">"]), + "</head>\n", + body_tag(), + "<center>\n", + "<h1>" ++ Title ++ "</h1>\n", + "</center>\n", + SubTitleHTML,"\n"]. index_footer() -> ["</table>\n" |