diff options
| author | Peter Andersson <[email protected]> | 2011-07-13 18:17:36 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2011-09-23 12:24:54 +0200 |
| commit | f703d6512219431fa7fe61e5ddd1a9ed32506daa (patch) | |
| tree | 6df2157019b840d8a1e2c0b1ef7ddb20b2a6daea /lib/common_test/src/ct_logs.erl | |
| parent | d3b636f97ce36e106ac53beb4cba0db13cd5656f (diff) | |
| download | otp-f703d6512219431fa7fe61e5ddd1a9ed32506daa.tar.gz otp-f703d6512219431fa7fe61e5ddd1a9ed32506daa.tar.bz2 otp-f703d6512219431fa7fe61e5ddd1a9ed32506daa.zip | |
Fix problem with logdir string and some other minor bugs
OTP-9370: Fix problem with crash if logdir contains multiple dirs
OTP-9155: Fix some minor remaining bugs
Diffstat (limited to 'lib/common_test/src/ct_logs.erl')
| -rw-r--r-- | lib/common_test/src/ct_logs.erl | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl index 5c4eb88c1f..761b906392 100644 --- a/lib/common_test/src/ct_logs.erl +++ b/lib/common_test/src/ct_logs.erl @@ -124,27 +124,27 @@ close(Info, StartDir) -> ok; Error -> io:format("Warning! Cleanup failed: ~p~n", [Error]) - end; + end, + make_all_suites_index(stop), + make_all_runs_index(stop); true -> - file:set_cwd("..") - end, - - make_all_suites_index(stop), - make_all_runs_index(stop), - - case ct_util:get_profile_data(browser, StartDir) of - undefined -> - ok; - BrowserData -> - case {proplists:get_value(prog, BrowserData), - proplists:get_value(args, BrowserData), - proplists:get_value(page, BrowserData)} of - {Prog,Args,Page} when is_list(Args), - is_list(Page) -> - URL = "file://" ++ ?abs(Page), - ct_util:open_url(Prog, Args, URL); - _ -> - ok + file:set_cwd(".."), + make_all_suites_index(stop), + make_all_runs_index(stop), + case ct_util:get_profile_data(browser, StartDir) of + undefined -> + ok; + BrowserData -> + case {proplists:get_value(prog, BrowserData), + proplists:get_value(args, BrowserData), + proplists:get_value(page, BrowserData)} of + {Prog,Args,Page} when is_list(Args), + is_list(Page) -> + URL = "\"file://" ++ ?abs(Page) ++ "\"", + ct_util:open_url(Prog, Args, URL); + _ -> + ok + end end end, ok. |