diff options
| author | Peter Andersson <[email protected]> | 2017-12-04 15:35:54 +0100 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2017-12-04 15:36:34 +0100 |
| commit | 82ba688773599f59215d395ac5dec7c862e1358b (patch) | |
| tree | 4fca5825ed49355f1f74d3183efa112bc26e81c5 /lib/common_test/src/ct_logs.erl | |
| parent | 9ce5f7b652eeb89332073a0ea1ccd103981659c8 (diff) | |
| parent | 162db37f1e90899c6d28c8e806e3d8eccbee9e6d (diff) | |
| download | otp-82ba688773599f59215d395ac5dec7c862e1358b.tar.gz otp-82ba688773599f59215d395ac5dec7c862e1358b.tar.bz2 otp-82ba688773599f59215d395ac5dec7c862e1358b.zip | |
Merge branch 'peppe/common_test/index_last_test/OTP-14281' into maint
* peppe/common_test/index_last_test/OTP-14281:
Show links to latest test run by using an html redirection file
OTP-14281
Diffstat (limited to 'lib/common_test/src/ct_logs.erl')
| -rw-r--r-- | lib/common_test/src/ct_logs.erl | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl index ba7660fe6a..81b5bad2bc 100644 --- a/lib/common_test/src/ct_logs.erl +++ b/lib/common_test/src/ct_logs.erl @@ -3144,8 +3144,8 @@ locate_priv_file(FileName) -> filename:join(get(ct_run_dir), FileName); _ -> %% executed on other process than ct_logs - {ok,RunDir} = get_log_dir(true), - filename:join(RunDir, FileName) + {ok,LogDir} = get_log_dir(true), + filename:join(LogDir, FileName) end, case filelib:is_file(PrivResultFile) of true -> @@ -3227,6 +3227,10 @@ get_ts_html_wrapper(TestName, Logdir, PrintLabel, Cwd, TableCols, Encoding) -> ?all_runs_name), Cwd), TestIndex = make_relative(filename:join(filename:dirname(CtLogdir), ?index_name), Cwd), + LatestTest = make_relative(filename:join(filename:dirname(CtLogdir), + ?suitelog_name++".latest.html"), + Cwd), + case Basic of true -> TileFile = filename:join(filename:join(CTPath,"priv"),"tile1.jpg"), @@ -3253,7 +3257,9 @@ get_ts_html_wrapper(TestName, Logdir, PrintLabel, Cwd, TableCols, Encoding) -> "<a href=\"", uri(AllRuns), "\">Test run history\n</a> | ", "<a href=\"", uri(TestIndex), - "\">Top level test index\n</a>\n</p>\n", + "\">Top level test index\n</a> | ", + "<a href=\"", uri(LatestTest), + "\">Latest test result</a>\n</p>\n", Copyright,"</center>\n</body>\n</html>\n"]}; _ -> Copyright = @@ -3300,7 +3306,9 @@ get_ts_html_wrapper(TestName, Logdir, PrintLabel, Cwd, TableCols, Encoding) -> "<a href=\"", uri(AllRuns), "\">Test run history\n</a> | ", "<a href=\"", uri(TestIndex), - "\">Top level test index\n</a>\n</p>\n", + "\">Top level test index\n</a> | ", + "<a href=\"", uri(LatestTest), + "\">Latest test result</a>\n</p>\n", Copyright,"</center>\n</body>\n</html>\n"]} end. |