1 files changed, 38 insertions, 17 deletions

diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index a202ca15e2..d80d216f9e 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -70,13 +70,14 @@
 	       enable_builtin_hooks,
 	       include = [],
 	       auto_compile,
-	       silent_connections,
+	       silent_connections = [],
 	       stylesheet,
 	       multiply_timetraps = 1,
 	       scale_timetraps = false,
 	       create_priv_dir,
 	       testspecs = [],
-	       tests}).
+	       tests,
+	       starter}).
 
 %%%-----------------------------------------------------------------
 %%% @spec script_start() -> void()
@@ -304,9 +305,9 @@ script_start1(Parent, Args) ->
     %% silent connections
     SilentConns =
 	get_start_opt(silent_connections,
-		      fun(["all"]) -> [];
+		      fun(["all"]) -> [all];
 			 (Conns) -> [list_to_atom(Conn) || Conn <- Conns]
-		      end, Args),
+		      end, [], Args),
     %% stylesheet
     Stylesheet = get_start_opt(stylesheet,
 			       fun([SS]) -> ?abs(SS) end, Args),
@@ -334,7 +335,8 @@ script_start1(Parent, Args) ->
 		     stylesheet = Stylesheet,
 		     multiply_timetraps = MultTT,
 		     scale_timetraps = ScaleTT,
-		     create_priv_dir = CreatePrivDir},
+		     create_priv_dir = CreatePrivDir,
+		     starter = script},
 
     %% check if log files should be refreshed or go on to run tests...
     Result = run_or_refresh(StartOpts, Args),
@@ -401,6 +403,9 @@ script_start2(StartOpts = #opts{vts = undefined,
 			AllVerbosity =
 			    merge_keyvals([StartOpts#opts.verbosity,
 					   SpecStartOpts#opts.verbosity]),
+			AllSilentConns =
+			    merge_vals([StartOpts#opts.silent_connections,
+					SpecStartOpts#opts.silent_connections]),
 			Cover =
 			    choose_val(StartOpts#opts.cover,
 				       SpecStartOpts#opts.cover),
@@ -467,6 +472,7 @@ script_start2(StartOpts = #opts{vts = undefined,
 					   logopts = AllLogOpts,
 					   basic_html = BasicHtml,
 					   verbosity = AllVerbosity,
+					   silent_connections = AllSilentConns,
 					   config = SpecStartOpts#opts.config,
 					   event_handlers = AllEvHs,
 					   ct_hooks = AllCTHooks,
@@ -914,9 +920,9 @@ run_test2(StartOpts) ->
 
     %% silent connections
     SilentConns = get_start_opt(silent_connections,
-				fun(all) -> [];
+				fun(all) -> [all];
 				   (Conns) -> Conns
-				end, StartOpts),
+				end, [], StartOpts),
     %% stylesheet
     Stylesheet = get_start_opt(stylesheet,
 			       fun(SS) -> ?abs(SS) end,
@@ -999,7 +1005,8 @@ run_test2(StartOpts) ->
 		 stylesheet = Stylesheet,
 		 multiply_timetraps = MultiplyTT,
 		 scale_timetraps = ScaleTT,
-		 create_priv_dir = CreatePrivDir},
+		 create_priv_dir = CreatePrivDir,
+		 starter = ct},
 
     %% test specification
     case proplists:get_value(spec, StartOpts) of
@@ -1043,6 +1050,8 @@ run_spec_file(Relaxed,
 				    SpecOpts#opts.stylesheet),
 	    AllVerbosity = merge_keyvals([Opts#opts.verbosity,
 					  SpecOpts#opts.verbosity]),
+	    AllSilentConns = merge_vals([Opts#opts.silent_connections,
+					 SpecOpts#opts.silent_connections]),
 	    AllConfig = merge_vals([CfgFiles, SpecOpts#opts.config]),
 	    Cover = choose_val(Opts#opts.cover,
 			       SpecOpts#opts.cover),
@@ -1091,6 +1100,7 @@ run_spec_file(Relaxed,
 			      stylesheet = Stylesheet,
 			      basic_html = BasicHtml,
 			      verbosity = AllVerbosity,
+			      silent_connections = AllSilentConns,
 			      config = AllConfig,
 			      event_handlers = AllEvHs,
 			      auto_compile = AutoCompile,
@@ -1354,6 +1364,7 @@ get_data_for_node(#testspec{label = Labels,
 			    basic_html = BHs,
 			    stylesheet = SSs,
 			    verbosity = VLvls,
+			    silent_connections = SilentConnsList,
 			    cover = CoverFs,
 			    config = Cfgs,
 			    userconfig = UsrCfgs,
@@ -1381,6 +1392,10 @@ get_data_for_node(#testspec{label = Labels,
 		    undefined -> [];
 		    Lvls -> Lvls
 		end,
+    SilentConns = case proplists:get_value(Node, SilentConnsList) of
+		      undefined -> [];
+		      SCs -> SCs
+		  end,
     Cover = proplists:get_value(Node, CoverFs),
     MT = proplists:get_value(Node, MTs),
     ST = proplists:get_value(Node, STs),
@@ -1398,6 +1413,7 @@ get_data_for_node(#testspec{label = Labels,
 	  basic_html = BasicHtml,
 	  stylesheet = Stylesheet,
 	  verbosity = Verbosity,
+	  silent_connections = SilentConns,
 	  cover = Cover,
 	  config = ConfigFiles,
 	  event_handlers = EvHandlers,
@@ -1619,6 +1635,7 @@ do_run(Tests, Skip, Opts, Args) when is_record(Opts, opts) ->
 			      "run ct:start_interactive()\n\n",[]),
 		    {error,interactive_mode};
 		_Pid ->
+		    ct_util:set_testdata({starter,Opts#opts.starter}),
 		    compile_and_run(Tests, Skip,
                                     Opts1#opts{verbosity=Verbosity}, Args)
 	    end
@@ -1632,13 +1649,16 @@ compile_and_run(Tests, Skip, Opts, Args) ->
     %% enable silent connections
     case Opts#opts.silent_connections of
 	[] ->
-	    Conns = ct_util:override_silence_all_connections(),
-	    ct_logs:log("Silent connections", "~p", [Conns]);
-	Conns when is_list(Conns) ->
-	    ct_util:override_silence_connections(Conns),
-	    ct_logs:log("Silent connections", "~p", [Conns]);
-	_ ->
-	    ok
+	    ok;
+	Conns ->
+	    case lists:member(all, Conns) of
+		true ->
+		    Conns1 = ct_util:override_silence_all_connections(),
+		    ct_logs:log("Silent connections", "~p", [Conns1]);
+		false ->
+		    ct_util:override_silence_connections(Conns),
+		    ct_logs:log("Silent connections", "~p", [Conns])
+	    end
     end,
     log_ts_names(Opts#opts.testspecs),
     TestSuites = suite_tuples(Tests),
@@ -1661,8 +1681,9 @@ compile_and_run(Tests, Skip, Opts, Args) ->
 	    
 	    {Tests1,Skip1} = final_tests(Tests,Skip,SavedErrors),
 	    
-	    possibly_spawn(true == proplists:get_value(noinput, Args),
-			   Tests1, Skip1, Opts);
+	    ReleaseSh = proplists:get_value(release_shell, Args),
+	    ct_util:set_testdata({release_shell,ReleaseSh}),
+	    possibly_spawn(ReleaseSh == true, Tests1, Skip1, Opts);
 	false ->
 	    io:nl(),
 	    ct_util:stop(clean),