3 files changed, 18 insertions, 7 deletions
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) ->
diff --git a/lib/test_server/src/ts_install_cth.erl b/lib/test_server/src/ts_install_cth.erl
index 9b6e10e7e2..a75cae3c9d 100644
--- a/lib/test_server/src/ts_install_cth.erl
+++ b/lib/test_server/src/ts_install_cth.erl
@@ -103,7 +103,9 @@ pre_init_per_suite(_Suite,Config,State) ->
 	end,
 
 	{add_node_name(Config, State), State}
-    catch Error:Reason ->
+    catch error:{badmatch,{error,enoent}} ->
+	{add_node_name(Config, State), State};
+	  Error:Reason ->
 	    Stack = erlang:get_stacktrace(),
 	    ct:pal("~p failed! ~p:{~p,~p}",[?MODULE,Error,Reason,Stack]),
 	    {{fail,{?MODULE,{Error,Reason, Stack}}},State}