Merge branch 'maint'

3 files changed, 47 insertions, 21 deletions

diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index 1f8160ff03..f5355bfefe 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -200,12 +200,19 @@ clear_stylesheet(TC) ->
 %%%-----------------------------------------------------------------
 %%% @spec get_log_dir() -> {ok,Dir} | {error,Reason}
 get_log_dir() ->
-    call({get_log_dir,false}).
+    get_log_dir(false).
 
 %%%-----------------------------------------------------------------
 %%% @spec get_log_dir(ReturnAbsName) -> {ok,Dir} | {error,Reason}
 get_log_dir(ReturnAbsName) ->
-    call({get_log_dir,ReturnAbsName}).
+    case call({get_log_dir,ReturnAbsName}) of
+	{error,does_not_exist} when ReturnAbsName == true ->
+	    {ok,filename:absname(".")};
+	{error,does_not_exist} ->
+	    {ok,"."};
+	Result ->
+	    Result
+    end.
 
 %%%-----------------------------------------------------------------
 %%% make_last_run_index() -> ok
@@ -552,7 +559,6 @@ log_timestamp({MS,S,US}) ->
 
 logger(Parent, Mode, Verbosity) ->
     register(?MODULE,self()),
-
     %%! Below is a temporary workaround for the limitation of
     %%! max one test run per second. 
     %%! --->
@@ -984,12 +990,11 @@ print_style_error(Fd,StyleSheet,Reason) ->
     print_style(Fd,undefined).    
 
 close_ctlog(Fd) ->
-    io:format(Fd,"\n</pre>\n",[]),
-    io:format(Fd,footer(),[]),
+    io:format(Fd, "\n</pre>\n", []),
+    io:format(Fd, [xhtml("<br><br>\n", "<br /><br />\n") | footer()], []),
     file:close(Fd).
 
 
-
 %%%-----------------------------------------------------------------
 %%% Make an index page for the last run
 make_last_run_index(StartTime) ->
@@ -1043,7 +1048,7 @@ make_last_run_index1(StartTime,IndexName) ->
 					     0, 0, 0, 0, 0, Missing),
     %% write current Totals to file, later to be used in all_runs log
     write_totals_file(?totals_name,Label,Logs1,Totals),
-    Index = [Index0|index_footer()],
+    Index = [Index0|last_run_index_footer()],
 
     case force_write_file(IndexName, unicode:characters_to_binary(Index)) of
 	ok ->
@@ -1452,17 +1457,30 @@ header1(Title, SubTitle, TableCols) ->
      "</center>\n",
      SubTitleHTML,"\n"].
 
-index_footer() ->
-    ["</table>\n"
+last_run_index_footer() ->
+    AllRuns = filename:join("../",?all_runs_name),
+    TestIndex = filename:join("../",?index_name),
+    ["</table>\n",
+     xhtml("<br><hr><p>\n", "<br /><hr /><p>\n"),
+     "<a href=\"", uri(AllRuns),
+     "\">Test run history\n</a>  |  ",
+     "<a href=\"", uri(TestIndex),
+     "\">Top level test index\n</a>\n</p>\n",
      "</center>\n" | footer()].
 
+all_suites_index_footer() ->
+    ["</table>\n",
+     "</center>\n",
+     xhtml("<br><br>\n", "<br /><br />\n") | footer()].
+
 all_runs_index_footer() ->
-    ["</tbody>\n</table>\n"
-     "</center>\n" | footer()].
+    ["</tbody>\n</table>\n",
+     "</center>\n",
+     xhtml("<br><br>\n", "<br /><br />\n") | footer()].
 
 footer() ->
      ["<center>\n",
-      xhtml("<br><br>\n<hr>\n", "<br /><br />\n"),
+      xhtml("<hr>\n", ""),
       xhtml("<p><font size=\"-1\">\n", "<div class=\"copyright\">"),
       "Copyright &copy; ", year(),
       " <a href=\"http://www.erlang.org\">Open Telecom Platform</a>",
@@ -1474,7 +1492,6 @@ footer() ->
       "</body>\n"
       "</html>\n"].
 
-
 body_tag() ->
     CTPath = code:lib_dir(common_test),
     TileFile = filename:join(filename:join(CTPath,"priv"),"tile1.jpg"),
@@ -2376,7 +2393,7 @@ make_all_suites_index2(IndexName, AllTestLogDirs) ->
 	make_all_suites_index3(AllTestLogDirs,
 			       all_suites_index_header(),
 			       0, 0, 0, 0, 0, [], []),
-    Index = [Index0|index_footer()],
+    Index = [Index0|all_suites_index_footer()],
     case force_write_file(IndexName, unicode:characters_to_binary(Index)) of
 	ok ->
 	    {ok,TempData};
@@ -2482,7 +2499,7 @@ make_all_suites_ix_temp(AbsIndexName, NewTestData, Label, AllTestLogDirs) ->
     Index0 = make_all_suites_ix_temp1(AllTestLogDirs1,
 				      all_suites_index_header(IndexDir),
 				      0, 0, 0, 0, 0),
-    Index = [Index0|index_footer()],
+    Index = [Index0|all_suites_index_footer()],
     case force_write_file(AbsIndexName, unicode:characters_to_binary(Index)) of
 	ok ->
 	    ok;
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index 21c10adccb..ffa21d054c 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -1183,7 +1183,7 @@ init_tester(Mod, Func, Args, Dir, Name, {_,_,MinLev}=Levels,
 	  "<td>~.3fs</td><td><b>~ts</b></td><td>~w Ok, ~w Failed~ts of ~w</td></tr>\n"
 	  "</tfoot>\n",
 	  [Time,SuccessStr,OkN,FailedN,SkipStr,OkN+FailedN+SkippedN]),
-    test_server_io:stop().
+    test_server_io:stop([major,html,unexpected_io]).
 
 report_severe_error(Reason) ->
     test_server_sup:framework_call(report, [severe_error,Reason]).
@@ -1588,7 +1588,7 @@ do_test_cases(TopCases, SkipCases,
 	    print(major, "=started       ~s",
 		   [lists:flatten(timestamp_get(""))]),
 
-	    put(test_server_html_footer, Footer),
+	    test_server_io:set_footer(Footer),
 
 	    run_test_cases(TestSpec, Config, TimetrapData)
     end;
diff --git a/lib/test_server/src/test_server_io.erl b/lib/test_server/src/test_server_io.erl
index a979deffc3..73d4468bda 100644
--- a/lib/test_server/src/test_server_io.erl
+++ b/lib/test_server/src/test_server_io.erl
@@ -29,7 +29,7 @@
 %%
 
 -module(test_server_io).
--export([start_link/0,stop/0,get_gl/1,set_fd/2,
+-export([start_link/0,stop/1,get_gl/1,set_fd/2,
 	 start_transaction/0,end_transaction/0,
 	 print_buffered/1,print/3,print_unexpected/1,
 	 set_footer/1,set_job_name/1,set_gl_props/1]).
@@ -55,10 +55,10 @@ start_link() ->
 	    Other
     end.
 
-stop() ->
+stop(FilesToClose) ->
     OldGL = group_leader(),
     group_leader(self(), self()),
-    req(stop),
+    req({stop,FilesToClose}),
     group_leader(OldGL, self()),
     ok.
 
@@ -213,12 +213,21 @@ handle_call({set_job_name,Name}, _From, St) ->
 handle_call({set_gl_props,Props}, _From, #st{shared_gl=Shared}=St) ->
     test_server_gl:set_props(Shared, Props),
     {reply,ok,St#st{gl_props=Props}};
-handle_call(stop, From, #st{shared_gl=SGL,gls=Gls0}=St0) ->
+handle_call({stop,FdTags}, From, #st{fds=Fds,shared_gl=SGL,gls=Gls0}=St0) ->
     St = St0#st{gls=gb_sets:insert(SGL, Gls0),stopping=From},
     gc(St),
     %% Give the users of the surviving group leaders some
     %% time to finish.
     erlang:send_after(2000, self(), stop_group_leaders),
+    %% close open log files
+    lists:foreach(fun(Tag) ->
+			  case gb_trees:lookup(Tag, Fds) of
+			      none ->
+				  ok;
+			      {value,Fd} ->
+				  file:close(Fd)
+			  end
+		  end, FdTags),
     {noreply,St}.
 
 handle_info({'EXIT',Pid,normal}, #st{gls=Gls0,stopping=From}=St) ->