Fix problem with CT hook start error causing IO to be sent to wrong group leader process.

4 files changed, 24 insertions, 23 deletions

diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index 3d4f674160..8fd4fd6339 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -493,9 +493,9 @@ end_tc(Mod,Func,TCPid,Result,Args,Return) ->
 		case ct_hooks:end_tc(
 			    Mod, FuncSpec, Args, Result, Return) of
 		    '$ct_no_change' ->
-			{FinalResult = ok,Result};
-		    FinalResult ->
-			{FinalResult,FinalResult}
+			{ok,Result};
+		    FinalResult1 ->
+			{FinalResult1,FinalResult1}
 		end,
 	    % send sync notification so that event handlers may print
 	    % in the log file before it gets closed
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index f8ace73cbf..e6ddf51bcd 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -97,11 +97,11 @@ logdir_node_prefix() ->
     logdir_prefix()++"."++atom_to_list(node()).
 
 %%%-----------------------------------------------------------------
-%%% @spec close(How) -> ok
+%%% @spec close(Info) -> ok
 %%%
 %%% @doc Create index pages with test results and close the CT Log
 %%% (tool-internal use only).
-close(How) ->
+close(Info) ->
     make_last_run_index(),
 
     ct_event:notify(#event{name=stop_logging,node=node(),data=[]}),
@@ -118,7 +118,7 @@ close(How) ->
 	    ok
     end,
 
-    if How == clean ->
+    if Info == clean ->
 	    case cleanup() of
 		ok ->
 		    ok;
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index 7bd7dc7d66..52a81a5b46 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -1111,6 +1111,8 @@ run(TestDirs) ->
     install([]),
     reformat_result(catch do_run(tests(TestDirs), [])).
 
+reformat_result({'EXIT',{user_error,Reason}}) ->
+    {error,Reason};
 reformat_result({user_error,Reason}) ->
     {error,Reason};
 reformat_result(Result) ->
diff --git a/lib/common_test/src/ct_util.erl b/lib/common_test/src/ct_util.erl
index 115207beed..7c04ecf17d 100644
--- a/lib/common_test/src/ct_util.erl
+++ b/lib/common_test/src/ct_util.erl
@@ -96,7 +96,8 @@ start(Mode,LogDir) ->
 	    Pid = spawn_link(fun() -> do_start(S,Mode,LogDir) end),
 	    receive 
 		{Pid,started} -> Pid;
-		{Pid,Error} -> exit(Error)
+		{Pid,Error} -> exit(Error);
+		{_Ref,{Pid,Error}} -> exit(Error)
 	    end;
 	Pid ->
 	    case get_mode() of
@@ -162,21 +163,19 @@ do_start(Parent,Mode,LogDir) ->
     end,
     {StartTime,TestLogDir} = ct_logs:init(Mode),
 
-    %% Initiate ct_hooks
+    ct_event:notify(#event{name=test_start,
+			   node=node(),
+			   data={StartTime,
+				 lists:flatten(TestLogDir)}}),
+    %% Initialize ct_hooks
     case catch ct_hooks:init(Opts) of
 	ok ->
-	    ok;
+	    Parent ! {self(),started};
 	{_,CTHReason} ->
 	    ct_logs:tc_print('Suite Callback',CTHReason,[]),
-	    Parent ! {self(), CTHReason},
-	    self() ! {{stop,normal},{self(),make_ref()}}
+	    self() ! {{stop,{self(),{user_error,CTHReason}}},
+		      {Parent,make_ref()}}
     end,
-
-    ct_event:notify(#event{name=test_start,
-			   node=node(),
-			   data={StartTime,
-				 lists:flatten(TestLogDir)}}),
-    Parent ! {self(),started},
     loop(Mode,[],StartDir).
 
 create_table(TableName,KeyPos) ->
@@ -317,7 +316,7 @@ loop(Mode,TestData,StartDir) ->
 	{reset_cwd,From} ->
 	    return(From,file:set_cwd(StartDir)),
 	    loop(From,TestData,StartDir);
-	{{stop,How},From} ->
+	{{stop,Info},From} ->
 	    Time = calendar:local_time(),
 	    ct_event:sync_notify(#event{name=test_done,
 					node=node(),
@@ -330,11 +329,11 @@ loop(Mode,TestData,StartDir) ->
 	    ets:delete(?conn_table),
 	    ets:delete(?board_table),
 	    ets:delete(?suite_table),
-	    ct_logs:close(How),
+	    ct_logs:close(Info),
 	    ct_event:stop(),
 	    ct_config:stop(),
 	    file:set_cwd(StartDir),
-	    return(From,ok);
+	    return(From, Info);
 	{Ref, _Msg} when is_reference(Ref) ->
 	    %% This clause is used when doing cast operations.
 	    loop(Mode,TestData,StartDir);
@@ -537,16 +536,16 @@ reset_silent_connections() ->
     
 
 %%%-----------------------------------------------------------------
-%%% @spec stop(How) -> ok
+%%% @spec stop(Info) -> ok
 %%%
 %%% @doc Stop the ct_util_server and close all existing connections
 %%% (tool-internal use only).
 %%%
 %%% @see ct
-stop(How) ->
+stop(Info) ->
     case whereis(ct_util_server) of
 	undefined -> ok;
-	_ -> call({stop,How})
+	_ -> call({stop,Info})
     end.
 
 %%%-----------------------------------------------------------------