Implement verbosity levels and parameter for log printout importance

7 files changed, 476 insertions, 158 deletions

diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index 571d99029f..003d7617cf 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -51,6 +51,8 @@
 
 -module(ct).
 
+-include("ct.hrl").
+
 %% Command line user interface for running tests
 -export([install/1, run/1, run/2, run/3,
 	 run_test/1, run_testspec/1, step/3, step/4,
@@ -60,9 +62,9 @@
 -export([require/1, require/2,
 	 get_config/1, get_config/2, get_config/3,
 	 reload_config/1,
-	 log/1, log/2, log/3,
-	 print/1, print/2, print/3,
-	 pal/1, pal/2, pal/3,
+	 log/1, log/2, log/3, log/4,
+	 print/1, print/2, print/3, print/4,
+	 pal/1, pal/2, pal/3, pal/4,
 	 capture_start/0, capture_stop/0, capture_get/0, capture_get/1,
 	 fail/1, fail/2, comment/1, comment/2, make_priv_dir/0,
 	 testcases/2, userdata/2, userdata/3,
@@ -150,7 +152,8 @@ run(TestDirs) ->
 %%%               {multiply_timetraps,M} | {scale_timetraps,Bool} |
 %%%               {repeat,N} | {duration,DurTime} | {until,StopTime} |
 %%%               {force_stop,Bool} | {decrypt,DecryptKeyOrFile} |
-%%%               {refresh_logs,LogDir} | {logopts,LogOpts} | {basic_html,Bool} | 
+%%%               {refresh_logs,LogDir} | {logopts,LogOpts} | 
+%%%               {verbosity,VLevels} | {basic_html,Bool} | 
 %%%               {ct_hooks, CTHs} | {enable_builtin_hooks,Bool}
 %%%   TestDirs = [string()] | string()
 %%%   Suites = [string()] | [atom()] | string() | atom()
@@ -182,6 +185,9 @@ run(TestDirs) ->
 %%%   DecryptFile = string()
 %%%   LogOpts = [LogOpt]
 %%%   LogOpt = no_nl | no_src
+%%%   VLevels = VLevel | [{Category,VLevel}]
+%%%   VLevel = integer()
+%%%   Category = atom()
 %%%   CTHs = [CTHModule | {CTHModule, CTHInitArgs}]
 %%%   CTHModule = atom()
 %%%   CTHInitArgs = term()
@@ -421,25 +427,41 @@ reload_config(Required)->
 
 %%%-----------------------------------------------------------------
 %%% @spec log(Format) -> ok
-%%% @equiv log(default,Format,[])
+%%% @equiv log(default,?STD_IMPORTANCE,Format,[])
 log(Format) ->
-    log(default,Format,[]).
+    log(default,?STD_IMPORTANCE,Format,[]).
 
 %%%-----------------------------------------------------------------
 %%% @spec log(X1,X2) -> ok
-%%%      X1 = Category | Format
+%%%      X1 = Category | Importance | Format
 %%%      X2 = Format | Args
-%%% @equiv log(Category,Format,Args)
+%%% @equiv log(Category,Importance,Format,Args)
 log(X1,X2) ->
-    {Category,Format,Args} = 
-	if is_atom(X1) -> {X1,X2,[]};
-	   is_list(X1) -> {default,X1,X2}
+    {Category,Importance,Format,Args} = 
+	if is_atom(X1)    -> {X1,?STD_IMPORTANCE,X2,[]};
+	   is_integer(X1) -> {default,X1,X2,[]};
+	   is_list(X1)    -> {default,?STD_IMPORTANCE,X1,X2}
+	end,
+    log(Category,Importance,Format,Args).
+
+%%%-----------------------------------------------------------------
+%%% @spec log(X1,X2,X3) -> ok
+%%%      X1 = Category | Importance
+%%%      X2 = Importance | Format
+%%%      X3 = Format | Args
+%%% @equiv log(Category,Importance,Format,Args)
+log(X1,X2,X3) ->
+    {Category,Importance,Format,Args} = 
+	if is_atom(X1), is_integer(X2) -> {X1,X2,X3,[]};
+	   is_atom(X1), is_list(X2)    -> {X1,?STD_IMPORTANCE,X2,X3};
+	   is_integer(X1)              -> {default,X1,X2,X3}
 	end,
-    log(Category,Format,Args).
+    log(Category,Importance,Format,Args).
 
 %%%-----------------------------------------------------------------
-%%% @spec log(Category,Format,Args) -> ok
+%%% @spec log(Category,Importance,Format,Args) -> ok
 %%%      Category = atom()
+%%%      Importance = integer()
 %%%      Format = string()
 %%%      Args = list()
 %%%
@@ -448,30 +470,52 @@ log(X1,X2) ->
 %%% <p>This function is meant for printing a string directly from a
 %%% test case to the test case log file.</p>
 %%%
-%%% <p>Default <code>Category</code> is <code>default</code> and
-%%% default <code>Args</code> is <code>[]</code>.</p>
-log(Category,Format,Args) ->
-    ct_logs:tc_log(Category,Format,Args).
+%%% <p>Default <code>Category</code> is <code>default</code>,
+%%% default <code>Importance</code> is <code>?STD_IMPORTANCE</code>,
+%%% and default value for <code>Args</code> is <code>[]</code>.</p>
+%%% <p>Please see the User's Guide for details on <code>Category</code>
+%%% and <code>Importance</code>.</p>
+log(Category,Importance,Format,Args) ->
+    ct_logs:tc_log(Category,Importance,Format,Args).
 
 
 %%%-----------------------------------------------------------------
 %%% @spec print(Format) -> ok
-%%% @equiv print(default,Format,[])
+%%% @equiv print(default,?STD_IMPORTANCE,Format,[])
 print(Format) ->
-    print(default,Format,[]).
+    print(default,?STD_IMPORTANCE,Format,[]).
 
 %%%-----------------------------------------------------------------
-%%% @equiv print(Category,Format,Args)
+%%% @spec print(X1,X2) -> ok
+%%%      X1 = Category | Importance | Format
+%%%      X2 = Format | Args
+%%% @equiv print(Category,Importance,Format,Args)
 print(X1,X2) ->
-    {Category,Format,Args} = 
-	if is_atom(X1) -> {X1,X2,[]};
-	   is_list(X1) -> {default,X1,X2}
+    {Category,Importance,Format,Args} = 
+	if is_atom(X1)    -> {X1,?STD_IMPORTANCE,X2,[]};
+	   is_integer(X1) -> {default,X1,X2,[]};
+	   is_list(X1)    -> {default,?STD_IMPORTANCE,X1,X2}
 	end,
-    print(Category,Format,Args).
+    print(Category,Importance,Format,Args).
 
 %%%-----------------------------------------------------------------
-%%% @spec print(Category,Format,Args) -> ok
+%%% @spec print(X1,X2,X3) -> ok
+%%%      X1 = Category | Importance
+%%%      X2 = Importance | Format
+%%%      X3 = Format | Args
+%%% @equiv print(Category,Importance,Format,Args)
+print(X1,X2,X3) ->
+    {Category,Importance,Format,Args} = 
+	if is_atom(X1), is_integer(X2) -> {X1,X2,X3,[]};
+	   is_atom(X1), is_list(X2)    -> {X1,?STD_IMPORTANCE,X2,X3};
+	   is_integer(X1)              -> {default,X1,X2,X3}
+	end,
+    print(Category,Importance,Format,Args).
+
+%%%-----------------------------------------------------------------
+%%% @spec print(Category,Importance,Format,Args) -> ok
 %%%      Category = atom()
+%%%      Importance = integer()
 %%%      Format = string()
 %%%      Args = list()
 %%%
@@ -480,33 +524,52 @@ print(X1,X2) ->
 %%% <p>This function is meant for printing a string from a test case
 %%% to the console.</p>
 %%%
-%%% <p>Default <code>Category</code> is <code>default</code> and
-%%% default <code>Args</code> is <code>[]</code>.</p>
-print(Category,Format,Args) ->
-    ct_logs:tc_print(Category,Format,Args).
+%%% <p>Default <code>Category</code> is <code>default</code>,
+%%% default <code>Importance</code> is <code>?STD_IMPORTANCE</code>,
+%%% and default value for <code>Args</code> is <code>[]</code>.</p>
+%%% <p>Please see the User's Guide for details on <code>Category</code>
+%%% and <code>Importance</code>.</p>
+print(Category,Importance,Format,Args) ->
+    ct_logs:tc_print(Category,Importance,Format,Args).
 
 
 %%%-----------------------------------------------------------------
 %%% @spec pal(Format) -> ok
-%%% @equiv pal(default,Format,[])
+%%% @equiv pal(default,?STD_IMPORTANCE,Format,[])
 pal(Format) ->
-    pal(default,Format,[]).
+    pal(default,?STD_IMPORTANCE,Format,[]).
 
 %%%-----------------------------------------------------------------
 %%% @spec pal(X1,X2) -> ok
-%%%      X1 = Category | Format
+%%%      X1 = Category | Importance | Format
 %%%      X2 = Format | Args
-%%% @equiv pal(Category,Format,Args)
+%%% @equiv pal(Category,Importance,Format,Args)
 pal(X1,X2) ->
-    {Category,Format,Args} = 
-	if is_atom(X1) -> {X1,X2,[]};
-	   is_list(X1) -> {default,X1,X2}
+    {Category,Importance,Format,Args} = 
+	if is_atom(X1)    -> {X1,?STD_IMPORTANCE,X2,[]};
+	   is_integer(X1) -> {default,X1,X2,[]};
+	   is_list(X1)    -> {default,?STD_IMPORTANCE,X1,X2}
+	end,
+    pal(Category,Importance,Format,Args).
+
+%%%-----------------------------------------------------------------
+%%% @spec pal(X1,X2,X3) -> ok
+%%%      X1 = Category | Importance
+%%%      X2 = Importance | Format
+%%%      X3 = Format | Args
+%%% @equiv pal(Category,Importance,Format,Args)
+pal(X1,X2,X3) ->
+    {Category,Importance,Format,Args} = 
+	if is_atom(X1), is_integer(X2) -> {X1,X2,X3,[]};
+	   is_atom(X1), is_list(X2)    -> {X1,?STD_IMPORTANCE,X2,X3};
+	   is_integer(X1)              -> {default,X1,X2,X3}
 	end,
-    pal(Category,Format,Args).
+    pal(Category,Importance,Format,Args).
 
 %%%-----------------------------------------------------------------
-%%% @spec pal(Category,Format,Args) -> ok
+%%% @spec pal(Category,Importance,Format,Args) -> ok
 %%%      Category = atom()
+%%%      Importance = integer()
 %%%      Format = string()
 %%%      Args = list()
 %%%
@@ -515,10 +578,13 @@ pal(X1,X2) ->
 %%% <p>This function is meant for printing a string from a test case,
 %%% both to the test case log file and to the console.</p>
 %%%
-%%% <p>Default <code>Category</code> is <code>default</code> and
-%%% default <code>Args</code> is <code>[]</code>.</p>
-pal(Category,Format,Args) ->
-    ct_logs:tc_pal(Category,Format,Args).
+%%% <p>Default <code>Category</code> is <code>default</code>,
+%%% default <code>Importance</code> is <code>?STD_IMPORTANCE</code>,
+%%% and default value for <code>Args</code> is <code>[]</code>.</p>
+%%% <p>Please see the User's Guide for details on <code>Category</code>
+%%% and <code>Importance</code>.</p>
+pal(Category,Importance,Format,Args) ->
+    ct_logs:tc_pal(Category,Importance,Format,Args).
 
 %%%-----------------------------------------------------------------
 %%% @spec capture_start() -> ok
diff --git a/lib/common_test/src/ct_config.erl b/lib/common_test/src/ct_config.erl
index 9277af5bc1..c585fe0995 100644
--- a/lib/common_test/src/ct_config.erl
+++ b/lib/common_test/src/ct_config.erl
@@ -760,13 +760,13 @@ check_config_files(Configs) ->
     end,
     lists:keysearch(error, 1, lists:flatten(lists:map(ConfigChecker, Configs))).
 
-prepare_user_configs([ConfigString|UserConfigs], Acc, new) ->
+prepare_user_configs([CallbackMod|UserConfigs], Acc, new) ->
     prepare_user_configs(UserConfigs,
-			 [{list_to_atom(ConfigString), []}|Acc],
+			 [{list_to_atom(CallbackMod),[]}|Acc],
 			 cur);
 prepare_user_configs(["and"|UserConfigs], Acc, _) ->
     prepare_user_configs(UserConfigs, Acc, new);
-prepare_user_configs([ConfigString|UserConfigs], [{LastMod, LastList}|Acc], cur) ->
+prepare_user_configs([ConfigString|UserConfigs], [{LastMod,LastList}|Acc], cur) ->
     prepare_user_configs(UserConfigs,
 			 [{LastMod, [ConfigString|LastList]}|Acc],
 			 cur);
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index 1ccbdc3718..a07a11eeb0 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -28,23 +28,24 @@
 
 -module(ct_logs).
 
--export([init/1,close/2,init_tc/1,end_tc/1]).
--export([get_log_dir/0,get_log_dir/1]).
--export([log/3,start_log/1,cont_log/2,end_log/0]).
--export([set_stylesheet/2,clear_stylesheet/1]).
--export([add_external_logs/1,add_link/3]).
+-export([init/2, close/2, init_tc/1, end_tc/1]).
+-export([get_log_dir/0, get_log_dir/1]).
+-export([log/3, start_log/1, cont_log/2, end_log/0]).
+-export([set_stylesheet/2, clear_stylesheet/1]).
+-export([add_external_logs/1, add_link/3]).
 -export([make_last_run_index/0]).
--export([make_all_suites_index/1,make_all_runs_index/1]).
+-export([make_all_suites_index/1, make_all_runs_index/1]).
 -export([get_ts_html_wrapper/3]).
 -export([xhtml/2, locate_default_css_file/0, make_relative/1]).
 
 %% Logging stuff directly from testcase
--export([tc_log/3,tc_log/4,tc_log_async/3,tc_print/3,tc_pal/3,ct_log/3,
-	 basic_html/0]).
+-export([tc_log/3, tc_log/4, tc_log_async/3, tc_print/3, tc_print/4,
+	 tc_pal/3, tc_pal/4, ct_log/3, basic_html/0]).
 
 %% Simulate logger process for use without ct environment running
 -export([simulate/0]).
 
+-include("ct.hrl").
 -include("ct_event.hrl").
 -include("ct_util.hrl").
 -include_lib("kernel/include/file.hrl").
@@ -79,9 +80,9 @@
 %%% started. A new directory named ct_run.&lt;timestamp&gt; is created
 %%% and all logs are stored under this directory.</p>
 %%%
-init(Mode) ->
+init(Mode, Verbosity) ->
     Self = self(),
-    Pid = spawn_link(fun() -> logger(Self,Mode) end),
+    Pid = spawn_link(fun() -> logger(Self, Mode, Verbosity) end),
     MRef = erlang:monitor(process,Pid),
     receive 
 	{started,Pid,Result} -> 
@@ -321,10 +322,16 @@ add_link(Heading,File,Type) ->
 	[filename:join("log_private",File),Type,File]).
 
 
-
 %%%-----------------------------------------------------------------
 %%% @spec tc_log(Category,Format,Args) -> ok
+%%% @equiv tc_log(Category,?STD_IMPORTANCE,Format,Args)
+tc_log(Category,Format,Args) ->
+    tc_log(Category,?STD_IMPORTANCE,Format,Args).
+
+%%%-----------------------------------------------------------------
+%%% @spec tc_log(Category,Importance,Format,Args) -> ok
 %%%      Category = atom()
+%%%      Importance = integer()
 %%%      Format = string()
 %%%      Args = list()
 %%%
@@ -333,19 +340,26 @@ add_link(Heading,File,Type) ->
 %%% <p>This function is called by <code>ct</code> when logging
 %%% stuff directly from a testcase (i.e. not from within the CT
 %%% framework).</p>
-tc_log(Category,Format,Args) ->
-    tc_log(Category,"User",Format,Args).
+tc_log(Category,Importance,Format,Args) ->
+    tc_log(Category,Importance,"User",Format,Args).
 
-tc_log(Category,Printer,Format,Args) ->
-    cast({log,sync,self(),group_leader(),[{div_header(Category,Printer),[]},
-					  {Format,Args},
-					  {div_footer(),[]}]}),
+tc_log(Category,Importance,Printer,Format,Args) ->
+    cast({log,sync,self(),group_leader(),Category,Importance,
+	  [{div_header(Category,Printer),[]},
+	   {Format,Args},
+	   {div_footer(),[]}]}),
     ok.
 
-
 %%%-----------------------------------------------------------------
 %%% @spec tc_log_async(Category,Format,Args) -> ok
+%%% @equiv tc_log_async(Category,?STD_IMPORTANCE,Format,Args)
+tc_log_async(Category,Format,Args) ->
+    tc_log_async(Category,?STD_IMPORTANCE,Format,Args).
+
+%%%-----------------------------------------------------------------
+%%% @spec tc_log_async(Category,Importance,Format,Args) -> ok
 %%%      Category = atom()
+%%%      Importance = integer()
 %%%      Format = string()
 %%%      Args = list()
 %%%
@@ -356,15 +370,22 @@ tc_log(Category,Printer,Format,Args) ->
 %%% to avoid deadlocks when e.g. the hook that handles SASL printouts
 %%% prints to the test case log file at the same time test server
 %%% asks ct_logs for an html wrapper.</p>
-tc_log_async(Category,Format,Args) ->
-    cast({log,async,self(),group_leader(),[{div_header(Category),[]},
-					   {Format,Args},
-					   {div_footer(),[]}]}),
+tc_log_async(Category,Importance,Format,Args) ->
+    cast({log,async,self(),group_leader(),Category,Importance,
+	  [{div_header(Category),[]},
+	   {Format,Args},
+	   {div_footer(),[]}]}),
     ok.
+%%%-----------------------------------------------------------------
+%%% @spec tc_print(Category,Format,Args)
+%%% @equiv tc_print(Category,?STD_IMPORTANCE,Format,Args)
+tc_print(Category,Format,Args) ->
+    tc_print(Category,?STD_IMPORTANCE,Format,Args).
 
 %%%-----------------------------------------------------------------
-%%% @spec tc_print(Category,Format,Args) -> ok
+%%% @spec tc_print(Category,Importance,Format,Args) -> ok
 %%%      Category = atom()
+%%%      Importance = integer()
 %%%      Format = string()
 %%%      Args = list()
 %%%
@@ -372,10 +393,20 @@ tc_log_async(Category,Format,Args) ->
 %%%
 %%% <p>This function is called by <code>ct</code> when printing
 %%% stuff a testcase on the user console.</p>
-tc_print(Category,Format,Args) ->
-    Head = get_heading(Category),
-    io:format(user, lists:concat([Head,Format,"\n\n"]), Args),
-    ok.
+tc_print(Category,Importance,Format,Args) ->
+    VLvl = case ct_util:get_testdata({verbosity,Category}) of
+	       undefined -> 
+		   ct_util:get_testdata({verbosity,'$unspecified'});
+	       Val ->
+		   Val
+	   end,
+    if Importance >= (100-VLvl) ->
+	    Head = get_heading(Category),
+	    io:format(user, lists:concat([Head,Format,"\n\n"]), Args),
+	    ok;
+       true ->
+	    ok
+    end.
 
 get_heading(default) ->
     io_lib:format("-----------------------------"
@@ -389,7 +420,14 @@ get_heading(Category) ->
 
 %%%-----------------------------------------------------------------
 %%% @spec tc_pal(Category,Format,Args) -> ok
+%%% @equiv tc_pal(Category,?STD_IMPORTANCE,Format,Args) -> ok
+tc_pal(Category,Format,Args) ->
+    tc_pal(Category,?STD_IMPORTANCE,Format,Args).
+
+%%%-----------------------------------------------------------------
+%%% @spec tc_pal(Category,Importance,Format,Args) -> ok
 %%%      Category = atom()
+%%%      Importance = integer()
 %%%      Format = string()
 %%%      Args = list()
 %%%
@@ -398,16 +436,17 @@ get_heading(Category) ->
 %%% <p>This function is called by <code>ct</code> when logging
 %%% stuff directly from a testcase. The info is written both in the
 %%% log and on the console.</p>
-tc_pal(Category,Format,Args) ->
-    tc_print(Category,Format,Args),
-    cast({log,sync,self(),group_leader(),[{div_header(Category),[]},
-					  {Format,Args},
-					  {div_footer(),[]}]}),
+tc_pal(Category,Importance,Format,Args) ->
+    tc_print(Category,Importance,Format,Args),
+    cast({log,sync,self(),group_leader(),Category,Importance,
+	  [{div_header(Category),[]},
+	   {Format,Args},
+	   {div_footer(),[]}]}),
     ok.
 
 
 %%%-----------------------------------------------------------------
-%%% @spec tc_pal(Category,Format,Args) -> ok
+%%% @spec ct_pal(Category,Format,Args) -> ok
 %%%      Category = atom()
 %%%      Format = string()
 %%%      Args = list()
@@ -469,7 +508,7 @@ log_timestamp({MS,S,US}) ->
 		      stylesheet,
 		      async_print_jobs}).
 
-logger(Parent,Mode) ->
+logger(Parent, Mode, Verbosity) ->
     register(?MODULE,self()),
 
     %%! Below is a temporary workaround for the limitation of
@@ -541,6 +580,23 @@ logger(Parent,Mode) ->
 	      [log_timestamp(now()),"Common Test Logger started"]),
     Parent ! {started,self(),{Time,filename:absname("")}},
     set_evmgr_gl(CtLogFd),
+
+    %% save verbosity levels in dictionary for fast lookups
+    io:format(CtLogFd, "\nVERBOSITY LEVELS:\n", []),
+    case proplists:get_value('$unspecified', Verbosity) of
+	undefined -> ok;
+	GenLvl    -> io:format(CtLogFd, "~-25s~3w~n",
+			       ["general level",GenLvl])
+    end,
+    [begin put({verbosity,Cat},VLvl),
+	   if Cat == '$unspecified' ->
+		   ok;
+	      true ->
+		   io:format(CtLogFd, "~-25w~3w~n", [Cat,VLvl])
+	   end
+     end || {Cat,VLvl} <- Verbosity],
+    io:nl(CtLogFd),
+
     logger_loop(#logger_state{parent=Parent,
 			      log_dir=AbsDir,
 			      start_time=Time,
@@ -551,29 +607,41 @@ logger(Parent,Mode) ->
 
 logger_loop(State) ->
     receive
-	{log,SyncOrAsync,Pid,GL,List} ->
-	    case get_groupleader(Pid, GL, State) of
-		{tc_log,TCGL,TCGLs} ->
-		    case erlang:is_process_alive(TCGL) of
-			true ->
-			    State1 = print_to_log(SyncOrAsync, Pid, TCGL,
-						  List, State),
-			    logger_loop(State1#logger_state{tc_groupleaders =
-							       TCGLs});
-			false ->
-			    %% Group leader is dead, so write to the
-			    %% CtLog instead
-			    Fd = State#logger_state.ct_log_fd,
-			    [begin io:format(Fd,Str,Args),io:nl(Fd) end || 
+	{log,SyncOrAsync,Pid,GL,Category,Importance,List} ->
+	    VLvl = case get({verbosity,Category}) of
+		       undefined -> get({verbosity,'$unspecified'});
+		       Val       -> Val
+		   end,
+	    if Importance >= (100-VLvl) ->
+		    case get_groupleader(Pid, GL, State) of
+			{tc_log,TCGL,TCGLs} ->
+			    case erlang:is_process_alive(TCGL) of
+				true ->
+				    State1 = print_to_log(SyncOrAsync, Pid,
+							  TCGL, List, State),
+				    logger_loop(State1#logger_state{
+						  tc_groupleaders = TCGLs});
+				false ->
+				    %% Group leader is dead, so write to the
+				    %% CtLog instead
+				    Fd = State#logger_state.ct_log_fd,
+				    [begin io:format(Fd,Str,Args),
+					   io:nl(Fd) end || {Str,Args} <- List],
+				    logger_loop(State)			    
+			    end;
+			{ct_log,Fd,TCGLs} ->
+			    [begin io:format(Fd,Str,Args),io:nl(Fd) end ||
 				{Str,Args} <- List],
-			    logger_loop(State)			    
+			    logger_loop(State#logger_state{
+					  tc_groupleaders = TCGLs})
 		    end;
-		{ct_log,Fd,TCGLs} ->
-		    [begin io:format(Fd,Str,Args),io:nl(Fd) end ||
-			{Str,Args} <- List],
-		    logger_loop(State#logger_state{tc_groupleaders = TCGLs})
-	    end;
+	       true ->
+		    logger_loop(State)
+	    end;			
 	{{init_tc,TCPid,GL,RefreshLog},From} ->
+	    %% make sure no IO for this test case from the
+	    %% CT logger gets rejected
+	    test_server:permit_io(GL, self()),
 	    print_style(GL, State#logger_state.stylesheet),
 	    set_evmgr_gl(GL),
 	    TCGLs = add_tc_gl(TCPid,GL,State),
@@ -665,6 +733,7 @@ print_to_log(sync, FromPid, TCGL, List, State) ->
 print_to_log(async, FromPid, TCGL, List, State) ->
     IoFun = create_io_fun(FromPid, State),
     Printer = fun() ->
+		      test_server:permit_io(TCGL, self()),
 		      io:format(TCGL, "~s", [lists:foldl(IoFun, [], List)])
 	      end,
     case State#logger_state.async_print_jobs of
diff --git a/lib/common_test/src/ct_run.erl b/lib/common_test/src/ct_run.erl
index 46aec04ec1..2ca2030723 100644
--- a/lib/common_test/src/ct_run.erl
+++ b/lib/common_test/src/ct_run.erl
@@ -39,12 +39,16 @@
 %% Misc internal functions
 -export([variables_file_name/1,script_start1/2,run_test2/1]).
 
+-include("ct.hrl").
 -include("ct_event.hrl").
 -include("ct_util.hrl").
 
 -define(abs(Name), filename:absname(Name)).
 -define(testdir(Name, Suite), ct_util:get_testdir(Name, Suite)).
 
+-define(default_verbosity, [{default,?MAX_VERBOSITY},
+			    {'$unspecified',?MAX_VERBOSITY}]).
+
 -record(opts, {label,
 	       profile,
 	       vts,
@@ -54,6 +58,7 @@
 	       step,
 	       logdir,
 	       logopts = [],
+	       verbosity = [],
 	       config = [],
 	       event_handlers = [],
 	       ct_hooks = [],
@@ -134,23 +139,27 @@ script_start(Args) ->
 				_ -> ""
 			    end
 		    end,
-		io:format("~nCommon Test~s starting (cwd is ~s)~n~n", [CTVsn,Cwd]),
+		io:format("~nCommon Test~s starting (cwd is ~s)~n~n",
+			  [CTVsn,Cwd]),
 		Self = self(),
 		Pid = spawn_link(fun() -> script_start1(Self, Args) end),
 	        receive
 		    {'EXIT',Pid,Reason} ->
 			case Reason of
 			    {user_error,What} ->
-				io:format("\nTest run failed!\nReason: ~p\n\n", [What]),
+				io:format("\nTest run failed!\n"
+					  "Reason: ~p\n\n", [What]),
 				{error,What};
 			    _ ->
-				io:format("Test run crashed! This could be an internal error "
+				io:format("Test run crashed! "
+					  "This could be an internal error "
 					  "- please report!\n\n"
 					  "~p\n\n", [Reason]),
 				{error,Reason}				
 			end;
 		    {Pid,{error,Reason}} ->
-			io:format("\nTest run failed! Reason:\n~p\n\n",[Reason]),
+			io:format("\nTest run failed! Reason:\n~p\n\n",
+				  [Reason]),
 			{error,Reason};
 		    {Pid,Result} ->
 			Result
@@ -173,6 +182,7 @@ script_start1(Parent, Args) ->
     LogDir = get_start_opt(logdir, fun([LogD]) -> LogD end, Args),
     LogOpts = get_start_opt(logopts, fun(Os) -> [list_to_atom(O) || O <- Os] end,
 			    [], Args),
+    Verbosity = verbosity_args2opts(Args),
     MultTT = get_start_opt(multiply_timetraps,
 			   fun([MT]) -> list_to_integer(MT) end, 1, Args),
     ScaleTT = get_start_opt(scale_timetraps,
@@ -253,6 +263,7 @@ script_start1(Parent, Args) ->
    StartOpts = #opts{label = Label, profile = Profile,
 		     vts = Vts, shell = Shell, cover = Cover,
 		     logdir = LogDir, logopts = LogOpts,
+		     verbosity = Verbosity,
 		     event_handlers = EvHandlers,
 		     ct_hooks = CTHooks,
 		     enable_builtin_hooks = EnableBuiltinHooks,
@@ -325,9 +336,12 @@ script_start2(StartOpts = #opts{vts = undefined,
 
 			AllLogOpts = merge_vals([StartOpts#opts.logopts,
 						 SpecStartOpts#opts.logopts]),
-
-			Cover = choose_val(StartOpts#opts.cover,
-					   SpecStartOpts#opts.cover),
+			AllVerbosity =
+			    merge_keyvals([StartOpts#opts.verbosity,
+					   SpecStartOpts#opts.verbosity]),
+			Cover =
+			    choose_val(StartOpts#opts.cover,
+				       SpecStartOpts#opts.cover),
 			MultTT =
 			    choose_val(StartOpts#opts.multiply_timetraps,
 				       SpecStartOpts#opts.multiply_timetraps),
@@ -362,6 +376,7 @@ script_start2(StartOpts = #opts{vts = undefined,
 					   cover = Cover,
 					   logdir = LogDir,
 					   logopts = AllLogOpts,
+					   verbosity = AllVerbosity,
 					   config = SpecStartOpts#opts.config,
 					   event_handlers = AllEvHs,
 					   ct_hooks = AllCTHooks,
@@ -519,6 +534,7 @@ script_start4(#opts{label = Label, profile = Profile,
 		    event_handlers = EvHandlers,
 		    ct_hooks = CTHooks,
 		    logopts = LogOpts,
+		    verbosity = Verbosity,
 		    enable_builtin_hooks = EnableBuiltinHooks,
 		    logdir = LogDir, testspecs = Specs}, _Args) ->
     %% label - used by ct_logs
@@ -536,7 +552,8 @@ script_start4(#opts{label = Label, profile = Profile,
 		  {ct_hooks, CTHooks},
 		  {enable_builtin_hooks,EnableBuiltinHooks}]) of
 	ok ->
-	    ct_util:start(interactive, LogDir),
+	    ct_util:start(interactive, LogDir,
+			  add_verbosity_defaults(Verbosity)),
 	    ct_util:set_testdata({logopts, LogOpts}),
 	    log_ts_names(Specs),
 	    io:nl(),
@@ -579,6 +596,7 @@ script_usage() ->
 	      "\n\t[-dir TestDir1 TestDir2 .. TestDirN] |"
 	      "\n\t[-suite Suite [-case Case]]"
 	      "\n\t[-logopts LogOpt1 LogOpt2 .. LogOptN]"
+	      "\n\t[-verbosity GenVLvl | [CategoryVLvl1 .. CategoryVLvlN]]"
 	      "\n\t[-include InclDir1 InclDir2 .. InclDirN]"
 	      "\n\t[-no_auto_compile]"
 	      "\n\t[-multiply_timetraps N]"
@@ -593,11 +611,12 @@ script_usage() ->
 	      "\n\t[-userconfig CallbackModule ConfigFile1 .. ConfigFileN]"
 	      "\n\t[-decrypt_key Key] | [-decrypt_file KeyFile]"
 	      "\n\t[-logdir LogDir]"
+	      "\n\t[-logopts LogOpt1 LogOpt2 .. LogOptN]"
+	      "\n\t[-verbosity GenVLvl | [CategoryVLvl1 .. CategoryVLvlN]]"
 	      "\n\t[-silent_connections [ConnType1 ConnType2 .. ConnTypeN]]"
-	      "\n\t[-stylesheet CSSFile]"
+	      "\n\t[-stylesheet CSSFile]"	     
 	      "\n\t[-cover CoverCfgFile]"
 	      "\n\t[-event_handler EvHandler1 EvHandler2 .. EvHandlerN]"
-	      "\n\t[-logopts LogOpt1 LogOpt2 .. LogOptN]"
 	      "\n\t[-ct_hooks CTHook1 CTHook2 .. CTHookN]"
 	      "\n\t[-include InclDir1 InclDir2 .. InclDirN]"
 	      "\n\t[-no_auto_compile]"
@@ -613,12 +632,13 @@ script_usage() ->
 	      "\n\t[-config ConfigFile1 ConfigFile2 .. ConfigFileN]"
 	      "\n\t[-decrypt_key Key] | [-decrypt_file KeyFile]"
 	      "\n\t[-logdir LogDir]"
+	      "\n\t[-logopts LogOpt1 LogOpt2 .. LogOptN]"
+	      "\n\t[-verbosity GenVLvl | [CategoryVLvl1 .. CategoryVLvlN]]"
 	      "\n\t[-allow_user_terms]"
 	      "\n\t[-silent_connections [ConnType1 ConnType2 .. ConnTypeN]]"
 	      "\n\t[-stylesheet CSSFile]"
 	      "\n\t[-cover CoverCfgFile]"
 	      "\n\t[-event_handler EvHandler1 EvHandler2 .. EvHandlerN]"
-	      "\n\t[-logopts LogOpt1 LogOpt2 .. LogOptN]"
 	      "\n\t[-ct_hooks CTHook1 CTHook2 .. CTHookN]"
 	      "\n\t[-include InclDir1 InclDir2 .. InclDirN]"
 	      "\n\t[-no_auto_compile]"
@@ -739,8 +759,10 @@ run_test2(StartOpts) ->
 				    (Lbl) when is_atom(Lbl) -> atom_to_list(Lbl)
 				 end, StartOpts),
     %% profile
-    Profile = get_start_opt(profile, fun(Prof) when is_list(Prof) -> Prof;
-					(Prof) when is_atom(Prof) -> atom_to_list(Prof)
+    Profile = get_start_opt(profile, fun(Prof) when is_list(Prof) ->
+					     Prof;
+					(Prof) when is_atom(Prof) ->
+					     atom_to_list(Prof)
 				     end, StartOpts),
     %% logdir
     LogDir = get_start_opt(logdir, fun(LD) when is_list(LD) -> LD end,
@@ -748,6 +770,19 @@ run_test2(StartOpts) ->
     %% logopts
     LogOpts = get_start_opt(logopts, value, [], StartOpts),
 
+    %% verbosity
+    Verbosity =
+	get_start_opt(verbosity,
+		      fun(VLvls) when is_list(VLvls) ->
+			      lists:map(fun(VLvl = {_Cat,_Lvl}) ->
+						VLvl;
+					   (Lvl) ->
+						{'$unspecified',Lvl}
+					end, VLvls);
+			 (VLvl) when is_integer(VLvl) ->
+			      [{'$unspecified',VLvl}]
+		      end, [], StartOpts),
+
     %% config & userconfig
     CfgFiles = ct_config:get_config_file_list(StartOpts),
 
@@ -857,6 +892,7 @@ run_test2(StartOpts) ->
     Opts = #opts{label = Label, profile = Profile,
 		 cover = Cover, step = Step, logdir = LogDir,
 		 logopts = LogOpts, config = CfgFiles,
+		 verbosity = Verbosity,
 		 event_handlers = EvHandlers,
 		 ct_hooks = CTHooks,
 		 enable_builtin_hooks = EnableBuiltinHooks,
@@ -905,6 +941,8 @@ run_spec_file(Relaxed,
 				SpecOpts#opts.logdir),
 	    AllLogOpts = merge_vals([Opts#opts.logopts,
 				     SpecOpts#opts.logopts]),
+	    AllVerbosity = merge_keyvals([Opts#opts.verbosity,
+					  SpecOpts#opts.verbosity]),
 	    AllConfig = merge_vals([CfgFiles, SpecOpts#opts.config]),
 	    Cover = choose_val(Opts#opts.cover,
 			       SpecOpts#opts.cover),
@@ -920,7 +958,7 @@ run_spec_file(Relaxed,
 				     SpecOpts#opts.include]),
 
 	    AllCTHooks = merge_vals([Opts#opts.ct_hooks,
-				      SpecOpts#opts.ct_hooks]),
+				     SpecOpts#opts.ct_hooks]),
 	    EnableBuiltinHooks = choose_val(Opts#opts.enable_builtin_hooks,
 					    SpecOpts#opts.enable_builtin_hooks),
 	    
@@ -931,6 +969,7 @@ run_spec_file(Relaxed,
 			      cover = Cover,
 			      logdir = which(logdir, LogDir),
 			      logopts = AllLogOpts,
+			      verbosity = AllVerbosity,
 			      config = AllConfig,
 			      event_handlers = AllEvHs,
 			      include = AllInclude,
@@ -1188,6 +1227,7 @@ get_data_for_node(#testspec{label = Labels,
 			    profile = Profiles,
 			    logdir = LogDirs,
 			    logopts = LogOptsList,
+			    verbosity = VLvls,
 			    cover = CoverFs,
 			    config = Cfgs,
 			    userconfig = UsrCfgs,
@@ -1208,6 +1248,10 @@ get_data_for_node(#testspec{label = Labels,
 		  undefined -> [];
 		  LOs -> LOs
 	      end,
+    Verbosity = case proplists:get_value(Node, VLvls) of
+		    undefined -> [];
+		    Lvls -> Lvls
+		end,
     Cover = proplists:get_value(Node, CoverFs),
     MT = proplists:get_value(Node, MTs),
     ST = proplists:get_value(Node, STs),
@@ -1221,6 +1265,7 @@ get_data_for_node(#testspec{label = Labels,
 	  profile = Profile,
 	  logdir = LogDir,
 	  logopts = LogOpts,
+	  verbosity = Verbosity,
 	  cover = Cover,
 	  config = ConfigFiles,
 	  event_handlers = EvHandlers,
@@ -1267,6 +1312,14 @@ choose_val(V0, _V1) ->
 merge_vals(Vs) ->
     lists:append(Vs).
 
+merge_keyvals(Vs) ->
+    make_unique(lists:append(Vs)).
+
+make_unique([Elem={Key,_} | Elems]) ->
+    [Elem | make_unique(proplists:delete(Key, Elems))];
+make_unique([]) ->
+    [].
+
 listify([C|_]=Str) when is_integer(C) -> [Str];
 listify(L) when is_list(L) -> L;
 listify(E) -> [E].
@@ -1376,7 +1429,8 @@ do_run(Tests, Misc, LogDir, LogOpts) when is_list(Misc),
     do_run(Tests, [], Opts1#opts{logdir = LogDir}, []);
 
 do_run(Tests, Skip, Opts, Args) when is_record(Opts, opts) ->
-    #opts{label = Label, profile = Profile, cover = Cover} = Opts,
+    #opts{label = Label, profile = Profile, cover = Cover,
+	  verbosity = VLvls} = Opts,
     %% label - used by ct_logs
     TestLabel =
 	if Label == undefined -> undefined;
@@ -1418,12 +1472,16 @@ do_run(Tests, Skip, Opts, Args) when is_record(Opts, opts) ->
 		"ct_framework" ->
 		    ok;
 		Other ->
-		    erlang:display(list_to_atom("Note: TEST_SERVER_FRAMEWORK = " ++ Other))
+		    erlang:display(
+		      list_to_atom(
+			"Note: TEST_SERVER_FRAMEWORK = " ++ Other))
 	    end,
-	    case ct_util:start(Opts#opts.logdir) of
+	    Verbosity = add_verbosity_defaults(VLvls),
+	    case ct_util:start(Opts#opts.logdir, Verbosity) of
 		{error,interactive_mode} ->
 		    io:format("CT is started in interactive mode. "
-			      "To exit this mode, run ct:stop_interactive().\n"
+			      "To exit this mode, "
+			      "run ct:stop_interactive().\n"
 			      "To enter the interactive mode again, "
 			      "run ct:start_interactive()\n\n",[]),
 		    {error,interactive_mode};
@@ -1464,7 +1522,9 @@ do_run(Tests, Skip, Opts, Args) when is_record(Opts, opts) ->
 
 			    {Tests1,Skip1} = final_tests(Tests,Skip,SavedErrors),
 
-			    R = (catch do_run_test(Tests1, Skip1, Opts1)),
+			    R = (catch do_run_test(Tests1, Skip1,
+						   Opts1#opts{
+						     verbosity=Verbosity})),
 			    case R of
 				{EType,_} = Error when EType == user_error ;
 						       EType == error ->
@@ -1504,11 +1564,13 @@ auto_compile(TestSuites) ->
 	end,
     SuiteMakeErrors =
 	lists:flatmap(fun({TestDir,Suite} = TS) ->
-			      case run_make(suites, TestDir, Suite, UserInclude) of
+			      case run_make(suites, TestDir, 
+					    Suite, UserInclude) of
 				  {error,{make_failed,Bad}} ->
 				      [{TS,Bad}];
 				  {error,_} ->
-				      [{TS,[filename:join(TestDir,"*_SUITE")]}];
+				      [{TS,[filename:join(TestDir,
+							  "*_SUITE")]}];
 				  _ ->
 				      []
 			      end
@@ -1546,20 +1608,24 @@ verify_suites(TestSuites) ->
 			if Suite == all ->
 				{[DS|Found],NotFound};
 			   true ->
-				Beam = filename:join(TestDir,
-						     atom_to_list(Suite)++".beam"),
+				Beam = 
+				    filename:join(TestDir,
+						  atom_to_list(Suite)++".beam"),
 				case filelib:is_regular(Beam) of
 				    true  ->
 					{[DS|Found],NotFound};
 				    false ->
 					case code:is_loaded(Suite) of
 					    {file,SuiteFile} ->
-						%% test suite is already loaded and
-						%% since auto_compile == false,
-						%% let's assume the user has
-						%% loaded the beam file explicitly
-						ActualDir = filename:dirname(SuiteFile),
-						{[{ActualDir,Suite}|Found],NotFound};
+						%% test suite is already
+						%% loaded and since
+						%% auto_compile == false, let's
+						%% assume the user has loaded 
+						%% the beam file explicitly
+						ActualDir = 
+						    filename:dirname(SuiteFile),
+						{[{ActualDir,Suite}|Found],
+						 NotFound};
 					    false ->
 						Name =
 						    filename:join(TestDir,
@@ -1581,7 +1647,8 @@ verify_suites(TestSuites) ->
 				ActualDir = filename:dirname(SuiteFile),
 				{[{ActualDir,Suite}|Found],NotFound};
 			    false ->
-				io:format(user, "Directory ~s is invalid~n", [Dir]),
+				io:format(user, "Directory ~s is "
+					  "invalid~n", [Dir]),
 				Name = filename:join(Dir, atom_to_list(Suite)),
 				{Found,[{DS,[Name]}|NotFound]}
 			end
@@ -1595,7 +1662,8 @@ save_make_errors([]) ->
 save_make_errors(Errors) ->
     Suites = get_bad_suites(Errors,[]),
     ct_logs:log("MAKE RESULTS",
-		"Error compiling or locating the following suites: ~n~p",[Suites]),
+		"Error compiling or locating the "
+		"following suites: ~n~p",[Suites]),
     %% save the info for logger
     file:write_file(?missing_suites_info,term_to_binary(Errors)),
     Errors.
@@ -1616,7 +1684,8 @@ step(TestDir, Suite, Case) ->
 %%%-----------------------------------------------------------------
 %%% @hidden
 %%% @equiv ct:step/4
-step(TestDir, Suite, Case, Opts) when is_list(TestDir), is_atom(Suite), is_atom(Case),
+step(TestDir, Suite, Case, Opts) when is_list(TestDir),
+				      is_atom(Suite), is_atom(Case),
 				   Suite =/= all, Case =/= all ->
     do_run([{TestDir,Suite,Case}], [{step,Opts}]).
 
@@ -1735,9 +1804,11 @@ continue(_MakeErrors) ->
     case set_group_leader_same_as_shell() of
 	true ->
 	    S = self(),
-	    io:format("Failed to compile or locate one or more test suites\n"
+	    io:format("Failed to compile or locate one "
+		      "or more test suites\n"
 		      "Press \'c\' to continue or \'a\' to abort.\n"
-		      "Will continue in 15 seconds if no answer is given!\n"),
+		      "Will continue in 15 seconds if no "
+		      "answer is given!\n"),
 	    Pid = spawn(fun() ->
 				case io:get_line('(c/a) ') of
 				    "c\n" ->
@@ -1769,7 +1840,8 @@ set_group_leader_same_as_shell() ->
 		     end
 	     end,	
     case [P || P <- processes(), GS2or3(P),
-	       true == lists:keymember(shell,1,element(2,process_info(P,dictionary)))] of
+	       true == lists:keymember(shell,1,
+				       element(2,process_info(P,dictionary)))] of
 	[GL|_] ->
 	    group_leader(GL, self());
 	[] ->
@@ -1815,12 +1887,14 @@ do_run_test(Tests, Skip, Opts) ->
 				incl_mods  = CovIncl,
 				cross      = CovCross,
 				src        = _CovSrc}} ->
-		    ct_logs:log("COVER INFO","Using cover specification file: ~s~n"
+		    ct_logs:log("COVER INFO","Using cover "
+				"specification file: ~s~n"
 				"App: ~w~n"
 				"Cross cover: ~w~n"
 				"Including ~w modules~n"
 				"Excluding ~w modules",
-				[CovFile,CovApp,CovCross,length(CovIncl),length(CovExcl)]),
+				[CovFile,CovApp,CovCross,
+				 length(CovIncl),length(CovExcl)]),
 
 		    %% cover export file will be used for export and import
 		    %% between tests so make sure it doesn't exist initially
@@ -1828,7 +1902,8 @@ do_run_test(Tests, Skip, Opts) ->
 			true ->
 			    DelResult = file:delete(CovExport),
 			    ct_logs:log("COVER INFO",
-					"Warning! Export file ~s already exists. "
+					"Warning! Export file ~s "
+					"already exists. "
 					"Deleting with result: ~p",
 					[CovExport,DelResult]);
 			false ->
@@ -1844,7 +1919,8 @@ do_run_test(Tests, Skip, Opts) ->
 		    %% start cover on specified nodes
 		    if (CovNodes /= []) and (CovNodes /= undefined) ->
 			    ct_logs:log("COVER INFO",
-					"Nodes included in cover session: ~w",
+					"Nodes included in cover "
+					"session: ~w",
 					[CovNodes]),
 			    cover:start(CovNodes);
 		       true ->
@@ -1869,17 +1945,27 @@ do_run_test(Tests, Skip, Opts) ->
 		    ct_logs:log("TEST INFO","~w test(s), ~w suite(s)",
 				[NoOfTests,NoOfSuites]);
 	       true ->
-		    io:format("~nTEST INFO: ~w test(s), ~w case(s) in ~w suite(s)~n~n",
+		    io:format("~nTEST INFO: ~w test(s), ~w case(s) "
+			      "in ~w suite(s)~n~n",
 			      [NoOfTests,NoOfCases,NoOfSuites]),
-		    ct_logs:log("TEST INFO","~w test(s), ~w case(s) in ~w suite(s)",
+		    ct_logs:log("TEST INFO","~w test(s), ~w case(s) "
+				"in ~w suite(s)",
 				[NoOfTests,NoOfCases,NoOfSuites])
 	    end,
-
+	    %% if the verbosity level is set lower than ?STD_IMPORTANCE, tell
+	    %% test_server to ignore stdout printouts to the test case log file
+	    case proplists:get_value(default, Opts#opts.verbosity) of
+		VLvl when is_integer(VLvl), (?STD_IMPORTANCE < (100-VLvl)) ->
+		    test_server_ctrl:reject_io_reqs(true);
+		_Lower ->
+		    ok
+	    end,
 	    test_server_ctrl:multiply_timetraps(Opts#opts.multiply_timetraps),
 	    test_server_ctrl:scale_timetraps(Opts#opts.scale_timetraps),
 
-	    test_server_ctrl:create_priv_dir(choose_val(Opts#opts.create_priv_dir,
-							auto_per_run)),
+	    test_server_ctrl:create_priv_dir(choose_val(
+					       Opts#opts.create_priv_dir,
+					       auto_per_run)),
 	    ct_event:notify(#event{name=start_info,
 				   node=node(),
 				   data={NoOfTests,NoOfSuites,NoOfCases}}),
@@ -2357,7 +2443,6 @@ parse_cth_args(String) ->
 	    String
     end.
 
-
 event_handler_args2opts(Args) ->
     case proplists:get_value(event_handler, Args) of
 	undefined ->
@@ -2380,6 +2465,42 @@ event_handler_init_args2opts([EH, Arg]) ->
 event_handler_init_args2opts([]) ->
     [].
 
+verbosity_args2opts(Args) ->
+    case proplists:get_value(verbosity, Args) of
+	undefined ->
+	    [];
+	VArgs ->	
+	    GetVLvls =
+		fun("and", {new,SoFar}) when is_list(SoFar) ->
+			{new,SoFar};
+		   ("and", {Lvl,SoFar}) when is_list(SoFar) -> 
+			{new,[{'$unspecified',list_to_integer(Lvl)} | SoFar]};
+		   (CatOrLvl, {new,SoFar}) when is_list(SoFar) -> 
+			{CatOrLvl,SoFar};
+		   (Lvl, {Cat,SoFar}) ->
+			{new,[{list_to_atom(Cat),list_to_integer(Lvl)} | SoFar]}
+		end,
+		case lists:foldl(GetVLvls, {new,[]}, VArgs) of
+		    {new,Parsed} ->
+			Parsed;
+		    {Lvl,Parsed} ->
+			[{'$unspecified',list_to_integer(Lvl)} | Parsed]
+		end
+    end.
+
+add_verbosity_defaults(VLvls) ->
+    case {proplists:get_value('$unspecified', VLvls),
+	  proplists:get_value(default, VLvls)} of
+	{undefined,undefined} ->	    
+	    ?default_verbosity ++ VLvls;
+	{Lvl,undefined} ->
+	    [{default,Lvl} | VLvls];
+	{undefined,_Lvl} ->
+	    [{'$unspecified',?MAX_VERBOSITY} | VLvls];
+	_ ->
+	    VLvls
+    end.
+
 %% This function reads pa and pz arguments, converts dirs from relative
 %% to absolute, and re-inserts them in the code path. The order of the
 %% dirs in the code path remain the same. Note however that since this
@@ -2454,10 +2575,14 @@ opts2args(EnvStartOpts) ->
 			  [{userconfig,[atom_to_list(CBM) | CfgStrs]}];
 		     ({userconfig,UserCfg}) when is_list(UserCfg) ->
 			  Strs =
-			      lists:map(fun({CBM,CfgStr=[X|_]}) when is_integer(X) ->
-						[atom_to_list(CBM),CfgStr,"and"];
-					   ({CBM,CfgStrs}) when is_list(CfgStrs) ->
-						[atom_to_list(CBM) | CfgStrs] ++ ["and"]
+			      lists:map(fun({CBM,CfgStr=[X|_]})
+					      when is_integer(X) ->
+						[atom_to_list(CBM),
+						 CfgStr,"and"];
+					   ({CBM,CfgStrs})
+					      when is_list(CfgStrs) ->
+						[atom_to_list(CBM) | CfgStrs] ++
+						    ["and"]
 					end, UserCfg),
 			  [_LastAnd|StrsR] = lists:reverse(lists:flatten(Strs)),
 			  [{userconfig,lists:reverse(StrsR)}];
@@ -2505,12 +2630,32 @@ opts2args(EnvStartOpts) ->
 		     ({event_handler,{EHs,Arg}}) when is_list(EHs) ->
 			  ArgStr = lists:flatten(io_lib:format("~p", [Arg])),
 			  Strs = lists:map(fun(EH) ->
-						   [atom_to_list(EH),ArgStr,"and"]
+						   [atom_to_list(EH),
+						    ArgStr,"and"]
 					   end, EHs),
 			  [_LastAnd|StrsR] = lists:reverse(lists:flatten(Strs)),
 			  [{event_handler_init,lists:reverse(StrsR)}];
 		     ({logopts,LOs}) when is_list(LOs) ->
 			  [{logopts,[atom_to_list(LO) || LO <- LOs]}];
+		     ({verbosity,?default_verbosity}) ->
+			  [];
+		     ({verbosity,VLvl}) when is_integer(VLvl) ->
+			  [{verbosity,[integer_to_list(VLvl)]}];
+		     ({verbosity,VLvls}) when is_list(VLvls) ->
+			  VLvlArgs =
+			      lists:flatmap(fun({'$unspecified',Lvl}) ->
+						    [integer_to_list(Lvl),
+						     "and"];
+					       ({Cat,Lvl}) ->
+						    [atom_to_list(Cat),
+						     integer_to_list(Lvl),
+						     "and"];
+					       (Lvl) ->
+						    [integer_to_list(Lvl),
+						     "and"]
+					    end, VLvls),
+			  [_LastAnd|VLvlArgsR] = lists:reverse(VLvlArgs),
+			  [{verbosity,lists:reverse(VLvlArgsR)}];
 		     ({ct_hooks,[]}) ->
 			  [];
 		     ({ct_hooks,CTHs}) when is_list(CTHs) ->
diff --git a/lib/common_test/src/ct_testspec.erl b/lib/common_test/src/ct_testspec.erl
index 4c05f57520..6d7db7bb75 100644
--- a/lib/common_test/src/ct_testspec.erl
+++ b/lib/common_test/src/ct_testspec.erl
@@ -505,6 +505,33 @@ add_tests([{logopts,Node,Opts}|Ts],Spec) ->
 add_tests([{logopts,Opts}|Ts],Spec) ->
     add_tests([{logopts,all_nodes,Opts}|Ts],Spec);
 
+%% --- verbosity ---
+add_tests([{verbosity,all_nodes,VLvls}|Ts],Spec) ->
+    VLvls0 = Spec#testspec.verbosity,
+    Tests = [{verbosity,N,VLvls} ||
+		N <- list_nodes(Spec),
+		lists:keymember(ref2node(N,Spec#testspec.nodes),1,
+				VLvls0) == false],
+    add_tests(Tests++Ts,Spec);
+add_tests([{verbosity,Nodes,VLvls}|Ts],Spec) when is_list(Nodes) ->
+    Ts1 = separate(Nodes,verbosity,[VLvls],Ts,Spec#testspec.nodes),
+    add_tests(Ts1,Spec);
+add_tests([{verbosity,Node,VLvls}|Ts],Spec) ->
+    VLvls0 = Spec#testspec.verbosity,
+    VLvls1 =
+	if is_integer(VLvls) ->
+		[{'$unspecified',VLvls}];
+	   is_list(VLvls) ->
+		lists:map(fun(VLvl = {_Cat,_Lvl}) -> VLvl;
+			     (Lvl) -> {'$unspecified',Lvl} end, VLvls)
+	end,
+    Verbosity = [{ref2node(Node,Spec#testspec.nodes),VLvls1} |
+		  lists:keydelete(ref2node(Node,Spec#testspec.nodes),
+				  1,VLvls0)],
+    add_tests(Ts,Spec#testspec{verbosity=Verbosity});
+add_tests([{verbosity,VLvls}|Ts],Spec) ->
+    add_tests([{verbosity,all_nodes,VLvls}|Ts],Spec);
+
 %% --- label ---
 add_tests([{label,all_nodes,Lbl}|Ts],Spec) ->
     Labels = Spec#testspec.label,
@@ -1146,6 +1173,8 @@ valid_terms() ->
      {logdir,3},
      {logopts,2},
      {logopts,3},
+     {verbosity,2},
+     {verbosity,3},
      {label,2},
      {label,3},
      {event_handler,2},
diff --git a/lib/common_test/src/ct_util.erl b/lib/common_test/src/ct_util.erl
index 9d6ee3c8b9..4b19062697 100644
--- a/lib/common_test/src/ct_util.erl
+++ b/lib/common_test/src/ct_util.erl
@@ -25,7 +25,8 @@
 %%%
 -module(ct_util).
 
--export([start/0,start/1,start/2,stop/1,update_last_run_index/0]).
+-export([start/0,start/1,start/2,start/3,
+	 stop/1,update_last_run_index/0]).
 
 -export([register_connection/4,unregister_connection/1,
 	 does_connection_exist/3,get_key_from_name/1]).
@@ -64,9 +65,13 @@
 -export([get_profile_data/0, get_profile_data/1,
 	 get_profile_data/2, open_url/3]).
 
+-include("ct.hrl").
 -include("ct_event.hrl").
 -include("ct_util.hrl").
 
+-define(default_verbosity, [{default,?MAX_VERBOSITY},
+			    {'$unspecified',?MAX_VERBOSITY}]).
+
 -record(suite_data, {key,name,value}).
 
 %%%-----------------------------------------------------------------
@@ -85,18 +90,21 @@
 %%%
 %%% @see ct
 start() ->
-    start(normal,".").
+    start(normal, ".", ?default_verbosity).
 
 start(LogDir) when is_list(LogDir) ->
-    start(normal,LogDir);
+    start(normal, LogDir, ?default_verbosity);
 start(Mode) ->
-    start(Mode,".").
+    start(Mode, ".", ?default_verbosity).
+
+start(LogDir, Verbosity) when is_list(LogDir) ->
+    start(normal, LogDir, Verbosity).
 
-start(Mode,LogDir) ->
+start(Mode, LogDir, Verbosity) ->
     case whereis(ct_util_server) of
 	undefined ->
 	    S = self(),
-	    Pid = spawn_link(fun() -> do_start(S,Mode,LogDir) end),
+	    Pid = spawn_link(fun() -> do_start(S, Mode, LogDir, Verbosity) end),
 	    receive 
 		{Pid,started} -> Pid;
 		{Pid,Error} -> exit(Error);
@@ -113,7 +121,7 @@ start(Mode,LogDir) ->
 	    end
     end.
 
-do_start(Parent,Mode,LogDir) ->
+do_start(Parent, Mode, LogDir, Verbosity) ->
     process_flag(trap_exit,true),
     register(ct_util_server,self()),
     create_table(?conn_table,#conn.handle),
@@ -173,7 +181,7 @@ do_start(Parent,Mode,LogDir) ->
 	false ->
 	    ok
     end,
-    {StartTime,TestLogDir} = ct_logs:init(Mode),
+    {StartTime,TestLogDir} = ct_logs:init(Mode, Verbosity),
 
     ct_event:notify(#event{name=test_start,
 			   node=node(),
@@ -193,7 +201,7 @@ do_start(Parent,Mode,LogDir) ->
 	    self() ! {{stop,{self(),{user_error,CTHReason}}},
 		      {Parent,make_ref()}}
     end,
-    loop(Mode,[],StartDir).
+    loop(Mode, [{{verbosity,Cat},Lvl} || {Cat,Lvl} <- Verbosity], StartDir).
 
 create_table(TableName,KeyPos) ->
     create_table(TableName,set,KeyPos).
diff --git a/lib/common_test/src/ct_util.hrl b/lib/common_test/src/ct_util.hrl
index 6b016e95df..48e3027f0a 100644
--- a/lib/common_test/src/ct_util.hrl
+++ b/lib/common_test/src/ct_util.hrl
@@ -34,6 +34,7 @@
 		   profile=[],
 		   logdir=["."],
 		   logopts=[],
+		   verbosity=[],
 		   cover=[],
 		   config=[],
 		   userconfig=[],