Implement verbosity levels and parameter for log printout importance

15 files changed, 1093 insertions, 277 deletions

diff --git a/lib/common_test/doc/src/ct_run.xml b/lib/common_test/doc/src/ct_run.xml
index 078b9b958c..df1defa664 100644
--- a/lib/common_test/doc/src/ct_run.xml
+++ b/lib/common_test/doc/src/ct_run.xml
@@ -88,11 +88,13 @@
 	[-step [config | keep_inactive]]
 	[-config ConfigFile1 ConfigFile2 .. ConfigFileN]
 	[-userconfig CallbackModule1 ConfigString1 and CallbackModule2
-	 ConfigString2 and .. and CallbackModuleN ConfigStringN]
+	 ConfigString2 and .. CallbackModuleN ConfigStringN]
 	[-decrypt_key Key] | [-decrypt_file KeyFile]
 	[-label Label]
 	[-logdir LogDir]
 	[-logopts LogOpts]
+	[-verbosity GenVLevel | [Category1 VLevel1 and
+	 Category2 VLevel2 and .. CategoryN VLevelN]]
 	[-silent_connections [ConnType1 ConnType2 .. ConnTypeN]]
 	[-stylesheet CSSFile]
 	[-cover CoverCfgFile]
@@ -107,7 +109,10 @@
         [-repeat N [-force_stop]] |
         [-duration HHMMSS [-force_stop]] |
         [-until [YYMoMoDD]HHMMSS [-force_stop]]
-	[-basic_html]</pre>
+	[-basic_html]
+    	[-ct_hooks CTHModule1 CTHOpts1 and CTHModule2 CTHOpts2 and ..
+	 CTHModuleN CTHOptsN]
+    </pre>
   </section>
   <section>
     <title>Run tests using test specification</title>
@@ -120,6 +125,8 @@
 	[-label Label]
 	[-logdir LogDir]
 	[-logopts LogOpts]
+	[-verbosity GenVLevel | [Category1 VLevel1 and
+	 Category2 VLevel2 and .. CategoryN VLevelN]]
 	[-allow_user_terms]
 	[-silent_connections [ConnType1 ConnType2 .. ConnTypeN]]
 	[-stylesheet CSSFile]
@@ -135,7 +142,10 @@
         [-repeat N [-force_stop]] |
         [-duration HHMMSS [-force_stop]] |
         [-until [YYMoMoDD]HHMMSS [-force_stop]]
-	[-basic_html]</pre>
+	[-basic_html]
+    	[-ct_hooks CTHModule1 CTHOpts1 and CTHModule2 CTHOpts2 and ..
+	 CTHModuleN CTHOptsN]
+    </pre>
   </section>
   <section>
     <title>Run tests in web based GUI</title>
@@ -147,6 +157,8 @@
 	[-userconfig CallbackModule1 ConfigString1 and CallbackModule2
          ConfigString2 and .. and CallbackModuleN ConfigStringN]
 	[-logopts LogOpts]
+	[-verbosity GenVLevel | [Category1 VLevel1 and
+	 Category2 VLevel2 and .. CategoryN VLevelN]]
 	[-decrypt_key Key] | [-decrypt_file KeyFile]
 	[-include InclDir1 InclDir2 .. InclDirN]
 	[-no_auto_compile]
diff --git a/lib/common_test/include/ct.hrl b/lib/common_test/include/ct.hrl
index 5a77108e1a..43b1b1c11f 100644
--- a/lib/common_test/include/ct.hrl
+++ b/lib/common_test/include/ct.hrl
@@ -19,3 +19,16 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
+%% the log level is used as argument to any CT logging function
+-define(MIN_IMPORTANCE, 0 ).
+-define(LOW_IMPORTANCE, 25).
+-define(STD_IMPORTANCE, 50).
+-define(HI_IMPORTANCE,  75).
+-define(MAX_IMPORTANCE, 99).
+
+%% verbosity thresholds to filter out logging printouts
+-define(MIN_VERBOSITY, 0  ).  %% turn logging off
+-define(LOW_VERBOSITY, 25 ).
+-define(STD_VERBOSITY, 50 ).
+-define(HI_VERBOSITY,  75 ).
+-define(MAX_VERBOSITY, 100).
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=[],
diff --git a/lib/common_test/test/Makefile b/lib/common_test/test/Makefile
index 560a0b0d5a..46df2b3e22 100644
--- a/lib/common_test/test/Makefile
+++ b/lib/common_test/test/Makefile
@@ -45,7 +45,8 @@ MODULES= \
 	ct_config_SUITE \
 	ct_master_SUITE \
 	ct_misc_1_SUITE \
-	ct_hooks_SUITE
+	ct_hooks_SUITE \
+	ct_verbosity_SUITE
 
 ERL_FILES= $(MODULES:%=%.erl)
 
diff --git a/lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl b/lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl
index 423cb2999b..7704a29768 100644
--- a/lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl
+++ b/lib/common_test/test/ct_priv_dir_SUITE_data/priv_dir_SUITE.erl
@@ -1,11 +1,21 @@
-%%%-------------------------------------------------------------------
-%%% @author Peter Andersson <[email protected]>
-%%% @copyright (C) 2012, Peter Andersson
-%%% @doc
-%%%
-%%% @end
-%%% Created : 23 Jan 2012 by Peter Andersson <[email protected]>
-%%%-------------------------------------------------------------------
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
 -module(priv_dir_SUITE).
 
 -compile(export_all).
diff --git a/lib/common_test/test/ct_verbosity_SUITE.erl b/lib/common_test/test/ct_verbosity_SUITE.erl
new file mode 100644
index 0000000000..349319de94
--- /dev/null
+++ b/lib/common_test/test/ct_verbosity_SUITE.erl
@@ -0,0 +1,244 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File: ct_verbosity_SUITE
+%%%
+%%% Description: 
+%%% Test that verbosity levels vs the importance parameter works as
+%%% expected.
+%%%
+%%%-------------------------------------------------------------------
+-module(ct_verbosity_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+-include_lib("common_test/include/ct_event.hrl").
+
+-define(eh, ct_test_support_eh).
+
+%%--------------------------------------------------------------------
+%% TEST SERVER CALLBACK FUNCTIONS
+%%--------------------------------------------------------------------
+
+%%--------------------------------------------------------------------
+%% Description: Since Common Test starts another Test Server
+%% instance, the tests need to be performed on a separate node (or
+%% there will be clashes with logging processes etc).
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config1 = ct_test_support:init_per_suite(Config),
+    Config1.
+
+end_per_suite(Config) ->
+    ct_test_support:end_per_suite(Config).
+
+init_per_testcase(TestCase, Config) ->
+    ct_test_support:init_per_testcase(TestCase, Config).
+
+end_per_testcase(TestCase, Config) ->
+    ct_test_support:end_per_testcase(TestCase, Config).
+
+suite() -> [{ct_hooks,[ts_install_cth]}].
+
+all() -> 
+    [
+     no_levels,
+     general_level_low,
+     general_level_std,
+     general_level_hi,
+     change_default,
+     combine_categories,
+     testspec_only,
+     merge_with_testspec
+    ].
+
+%%--------------------------------------------------------------------
+%% TEST CASES
+%%--------------------------------------------------------------------
+
+%%%-----------------------------------------------------------------
+%%%
+no_levels(Config) ->
+    TC = no_levels,
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "io_test_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},{label,TC}], Config),
+    ok = execute(TC, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+general_level_low(Config) ->
+    TC = general_level_low,
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "io_test_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},{label,TC},
+			  {verbosity,0}], Config),
+    ok = execute(TC, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+general_level_std(Config) ->
+    TC = general_level_std,
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "io_test_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},{label,TC},
+			  {verbosity,50}], Config),
+    ok = execute(TC, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+general_level_hi(Config) ->
+    TC = general_level_high,
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "io_test_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},{label,TC},
+			  {verbosity,100}], Config),
+    ok = execute(TC, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+change_default(Config) ->
+    TC = change_default,
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "io_test_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},{label,TC},
+			  {verbosity,[{default,49}]}], Config),
+    ok = execute(TC, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+combine_categories(Config) ->
+    TC = combine_categories,
+    DataDir = ?config(data_dir, Config),
+    Suite = filename:join(DataDir, "io_test_SUITE"),
+    {Opts,ERPid} = setup([{suite,Suite},{label,TC},
+			  {verbosity,[{error,?HI_VERBOSITY},
+				      {default,?LOW_VERBOSITY}]}], Config),
+    ok = execute(TC, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+testspec_only(Config) ->
+    TC = testspec_only,
+    DataDir = ?config(data_dir, Config),
+    PrivDir = ?config(priv_dir, Config),
+
+    TestSpec = [{verbosity,[{default,1},{error,75},100]},
+		{suites,DataDir,[io_test_SUITE]},
+		{label,TC}],
+
+    TestSpecName = ct_test_support:write_testspec(TestSpec, PrivDir,
+						  "verbosity_1_spec"),
+    {Opts,ERPid} = setup([{spec,TestSpecName}], Config),
+
+    ok = execute(TC, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%%
+merge_with_testspec(Config) ->
+    TC = merge_with_testspec,
+    DataDir = ?config(data_dir, Config),
+    PrivDir = ?config(priv_dir, Config),
+
+    TestSpec = [{verbosity,[{default,100},{error,100}]},
+		{suites,DataDir,[io_test_SUITE]},
+		{label,TC}],
+
+    TestSpecName = ct_test_support:write_testspec(TestSpec, PrivDir,
+						  "verbosity_2_spec"),
+
+    %% below should override verbosity categories in testspec
+    {Opts,ERPid} = setup([{spec,TestSpecName},
+			  {verbosity,[{default,0},0]}],
+			 Config),
+
+    ok = execute(TC, Opts, ERPid, Config).
+
+%%%-----------------------------------------------------------------
+%%% HELP FUNCTIONS
+%%%-----------------------------------------------------------------
+
+setup(Test, Config) ->
+    Opts0 = ct_test_support:get_opts(Config),
+    Level = ?config(trace_level, Config),
+    EvHArgs = [{cbm,ct_test_support},{trace_level,Level}],
+    Opts = Opts0 ++ [{event_handler,{?eh,EvHArgs}}|Test],
+    ERPid = ct_test_support:start_event_receiver(Config),
+    {Opts,ERPid}.
+
+execute(Name, Opts, ERPid, Config) ->
+    ok = ct_test_support:run(Opts, Config),
+    Events = ct_test_support:get_events(ERPid, Config),
+
+    ct_test_support:log_events(Name, 
+			       reformat(Events, ?eh),
+			       ?config(priv_dir, Config),
+			       Opts),
+
+    TestEvents = events_to_check(Name),
+    ct_test_support:verify_events(TestEvents, Events, Config).
+
+reformat(Events, EH) ->
+    ct_test_support:reformat(Events, EH).
+
+%%%-----------------------------------------------------------------
+%%% TEST EVENTS
+%%%-----------------------------------------------------------------
+events_to_check(Test) ->
+    %% 2 tests (ct:run_test + script_start) is default
+    events_to_check(Test, 2).
+
+events_to_check(_, 0) ->
+    [];
+events_to_check(Test, N) ->
+    test_events(Test) ++ events_to_check(Test, N-1).
+
+
+test_events(_) ->
+    [
+     {?eh,tc_done,{io_test_SUITE,tc1,ok}},
+     {?eh,tc_done,{io_test_SUITE,tc2,ok}},
+     {?eh,tc_done,{io_test_SUITE,tc3,ok}},
+
+     {parallel,
+      [
+       {?eh,tc_start,{io_test_SUITE,tc1}},
+       {?eh,tc_start,{io_test_SUITE,tc2}},
+       {?eh,tc_start,{io_test_SUITE,tc3}},
+       {?eh,tc_done,{io_test_SUITE,tc1,ok}},
+       {?eh,tc_done,{io_test_SUITE,tc2,ok}},
+       {?eh,tc_done,{io_test_SUITE,tc3,ok}},
+       {parallel,
+	[
+	 {?eh,tc_start,{io_test_SUITE,tc1}},
+	 {?eh,tc_start,{io_test_SUITE,tc2}},
+	 {?eh,tc_start,{io_test_SUITE,tc3}},
+	 {?eh,tc_done,{io_test_SUITE,tc1,ok}},
+	 {?eh,tc_done,{io_test_SUITE,tc2,ok}},
+	 {?eh,tc_done,{io_test_SUITE,tc3,ok}},
+	 {?eh,test_stats,{9,0,{0,0}}}
+	]}
+       ]},
+
+     {?eh,test_done,{'DEF','STOP_TIME'}},
+     {?eh,stop_logging,[]}
+    ].
+
diff --git a/lib/common_test/test/ct_verbosity_SUITE_data/io_test_SUITE.erl b/lib/common_test/test/ct_verbosity_SUITE_data/io_test_SUITE.erl
new file mode 100644
index 0000000000..946e1c1989
--- /dev/null
+++ b/lib/common_test/test/ct_verbosity_SUITE_data/io_test_SUITE.erl
@@ -0,0 +1,156 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2009-2012. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(io_test_SUITE).
+
+-compile(export_all).
+
+-include_lib("common_test/include/ct.hrl").
+
+%%--------------------------------------------------------------------
+%% @spec suite() -> Info
+%% Info = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+suite() ->
+    [{timetrap,{seconds,10}}].
+
+%%--------------------------------------------------------------------
+%% @spec init_per_suite(Config0) ->
+%%     Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_suite(Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_suite(Config0) -> void() | {save_config,Config1}
+%% Config0 = Config1 = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+end_per_suite(_Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec init_per_group(GroupName, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_group(_GroupName, Config) ->
+    Config.
+    
+%%--------------------------------------------------------------------
+%% @spec end_per_group(GroupName, Config0) ->
+%%               void() | {save_config,Config1}
+%% GroupName = atom()
+%% Config0 = Config1 = [tuple()]
+%% @end
+%%--------------------------------------------------------------------
+end_per_group(_GroupName, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec init_per_testcase(TestCase, Config0) ->
+%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+%%--------------------------------------------------------------------
+%% @spec end_per_testcase(TestCase, Config0) ->
+%%               void() | {save_config,Config1} | {fail,Reason}
+%% TestCase = atom()
+%% Config0 = Config1 = [tuple()]
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+end_per_testcase(_TestCase, _Config) ->
+    ok.
+
+%%--------------------------------------------------------------------
+%% @spec groups() -> [Group]
+%% Group = {GroupName,Properties,GroupsAndTestCases}
+%% GroupName = atom()
+%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+%% TestCase = atom()
+%% Shuffle = shuffle | {shuffle,{integer(),integer(),integer()}}
+%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+%%              repeat_until_any_ok | repeat_until_any_fail
+%% N = integer() | forever
+%% @end
+%%--------------------------------------------------------------------
+groups() ->
+    [{g1, [parallel], [tc1,tc2,tc3,{group,g2}]},
+     {g2, [parallel], [tc1,tc2,tc3]}].
+
+%%--------------------------------------------------------------------
+%% @spec all() -> GroupsAndTestCases | {skip,Reason}
+%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+%% GroupName = atom()
+%% TestCase = atom()
+%% Reason = term()
+%% @end
+%%--------------------------------------------------------------------
+all() -> 
+    [tc1,tc2,tc3,{group,g1}].
+
+tc1(_C) ->
+    io:format("This is an io:format(~p)~n", [[]]),
+    ct:log("ct:log(default)", []),
+    ct:log(?STD_IMPORTANCE, "ct:log(default,~p)", [?STD_IMPORTANCE]),
+    ct:log(error, "ct:log(error)", []),
+    ct:log(error, ?STD_IMPORTANCE, "ct:log(error,~p)", [?STD_IMPORTANCE]),
+    ct:log(1, "ct:log(default,~p)", [1]),
+    ct:log(error, 1, "ct:log(error,~p)", [1]),
+    ct:log(99, "ct:log(default,~p)", [99]),
+    ct:log(error, 99, "ct:log(error,~p)", [99]),
+    ok.
+
+tc2(_C) ->
+    io:format("This is an io:format(~p)~n", [[]]),
+    ct:pal("ct:pal(default)", []),
+    ct:pal(?STD_IMPORTANCE, "ct:pal(default,~p)", [?STD_IMPORTANCE]),
+    ct:pal(error, "ct:pal(error)", []),
+    ct:pal(error, ?STD_IMPORTANCE, "ct:pal(error,~p)", [?STD_IMPORTANCE]),
+    ct:pal(1, "ct:pal(default,~p)", [1]),
+    ct:pal(error, 1, "ct:pal(error,~p)", [1]),
+    ct:pal(99, "ct:pal(default,~p)", [99]),
+    ct:pal(error, 99, "ct:pal(error,~p)", [99]),
+    ok.
+
+tc3(_C) ->
+    io:format("This is an io:format(~p)~n", [[]]),
+    ct:print("ct:print(default)", []),
+    ct:print(?STD_IMPORTANCE, "ct:print(default,~p)", [?STD_IMPORTANCE]),
+    ct:print(error, "ct:print(error)", []),
+    ct:print(error, ?STD_IMPORTANCE, "ct:print(error,~p)", [?STD_IMPORTANCE]),
+    ct:print(1, "ct:print(default,~p)", [1]),
+    ct:print(error, 1, "ct:print(error,~p)", [1]),
+    ct:print(99, "ct:print(default,~p)", [99]),
+    ct:print(error, 99, "ct:print(error,~p)", [99]),
+    ok.
diff --git a/lib/test_server/src/test_server.erl b/lib/test_server/src/test_server.erl
index 6e94e4861a..1b94ada6b4 100644
--- a/lib/test_server/src/test_server.erl
+++ b/lib/test_server/src/test_server.erl
@@ -35,6 +35,7 @@
 -export([fail/0,fail/1,format/1,format/2,format/3]).
 -export([capture_start/0,capture_stop/0,capture_get/0]).
 -export([messages_get/0]).
+-export([permit_io/2]).
 -export([hours/1,minutes/1,seconds/1,sleep/1,adjusted_sleep/1,timecall/3]).
 -export([timetrap_scale_factor/0,timetrap/1,get_timetrap_info/0,
 	 timetrap_cancel/1,timetrap_cancel/0]).
@@ -523,7 +524,7 @@ stick_all_sticky(Node,Sticky) ->
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% run_test_case_apply(Mod,Func,Args,Name,RunInit,TimetrapData) ->
+%% run_test_case_apply(Mod,Func,Args,Name,RunInit,TimetrapData,RejectIoReqs) ->
 %%               {Time,Value,Loc,Opts,Comment} | {died,Reason,unknown,Comment}
 %%
 %% Time = float()   (seconds)
@@ -558,8 +559,12 @@ stick_all_sticky(Node,Sticky) ->
 %% ScaleTimetrap indicates if test_server should attemp to automatically
 %% compensate timetraps for runtime delays introduced by e.g. tools like
 %% cover.
+%% 
+%% RejectIoReqs (bool) is information about whether printouts to stdout
+%% should be visible in the minor log file or not.
 
-run_test_case_apply({CaseNum,Mod,Func,Args,Name,RunInit,TimetrapData}) ->
+run_test_case_apply({CaseNum,Mod,Func,Args,Name,
+		     RunInit,TimetrapData,RejectIoReqs}) ->
     purify_format("Test case #~w ~w:~w/1", [CaseNum, Mod, Func]),
     case os:getenv("TS_RUN_VALGRIND") of
 	false ->
@@ -570,17 +575,19 @@ run_test_case_apply({CaseNum,Mod,Func,Args,Name,RunInit,TimetrapData}) ->
     end,
     test_server_h:testcase({Mod,Func,1}),
     ProcBef = erlang:system_info(process_count),
-    Result = run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData),
+    Result = run_test_case_apply(Mod, Func, Args, Name, RunInit,
+				 TimetrapData, RejectIoReqs),
     ProcAft = erlang:system_info(process_count),
     purify_new_leaks(),
     DetFail = get(test_server_detected_fail),
     {Result,DetFail,ProcBef,ProcAft}.
 
-run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) ->
+run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData, RejectIoReqs) ->
     case get(test_server_job_dir) of
 	undefined ->
 	    %% i'm a local target
-	    do_run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData);
+	    do_run_test_case_apply(Mod, Func, Args, Name, RunInit,
+				   TimetrapData, RejectIoReqs);
 	JobDir ->
 	    %% i'm a remote target
 	    case Args of
@@ -595,13 +602,14 @@ run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) ->
 		    Config2 = lists:keyreplace(priv_dir, 1, Config1,
 					       {priv_dir,TargetPrivDir}),
 		    do_run_test_case_apply(Mod, Func, [Config2], Name, RunInit,
-					   TimetrapData);
+					   TimetrapData, RejectIoReqs);
 		_other ->
 		    do_run_test_case_apply(Mod, Func, Args, Name, RunInit,
-					   TimetrapData)
+					   TimetrapData, RejectIoReqs)
 	    end
     end.
-do_run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) ->
+do_run_test_case_apply(Mod, Func, Args, Name, RunInit,
+		       TimetrapData, RejectIoReqs) ->
     {ok,Cwd} = file:get_cwd(),
     Args2Print = case Args of
 		     [Args1] when is_list(Args1) ->
@@ -628,7 +636,8 @@ do_run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) ->
 	  end),
     group_leader(OldGLeader, self()),
     put(test_server_detected_fail, []),
-    run_test_case_msgloop(Ref, Pid, false, false, "", undefined, starting).
+    run_test_case_msgloop(Ref, Pid, false, RejectIoReqs, false, "",
+			  undefined, starting).
 
 %% Ugly bug (pre R5A):
 %% If this process (group leader of the test case) terminates before
@@ -639,7 +648,7 @@ do_run_test_case_apply(Mod, Func, Args, Name, RunInit, TimetrapData) ->
 %% A test case is known to have failed if it returns {'EXIT', _} tuple,
 %% or sends a message {failed, File, Line} to it's group_leader
 %%
-run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
+run_test_case_msgloop(Ref, Pid, CaptureStdout, RejectIoReqs, Terminate,
 		      Comment, CurrConf, Status) ->
     %% NOTE: Keep job_proxy_msgloop/0 up to date when changes
     %%       are made in this function!
@@ -655,7 +664,7 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
 	end,
     receive
 	{test_case_initialized,Pid} ->
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
 				  Comment,CurrConf,running);
 	Abort = {abort_current_testcase,_,_} when Status == starting ->
 	    %% we're in init phase, must must postpone this operation
@@ -663,7 +672,7 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
 	    %% gets killed)
 	    self() ! Abort,
 	    erlang:yield(),
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
 				  Comment,CurrConf,Status);
 	{abort_current_testcase,Reason,From} ->
 	    Line = case is_process_alive(Pid) of
@@ -694,82 +703,92 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
 				    Error1
 			    end
 		    end,
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
 				  NewComment,CurrConf,Status);
+	{permit_io,FromPid} ->
+	    put({permit_io,FromPid},true),
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
+				  Comment,CurrConf,Status);
         {io_request,From,ReplyAs,{put_chars,io_lib,Func,[Format,Args]}}
 	when is_list(Format) ->
 	    Msg = (catch io_lib:Func(Format,Args)),
-	    run_test_case_msgloop_io(ReplyAs,CaptureStdout,Msg,From,Func),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+	    run_test_case_msgloop_io(From,ReplyAs,CaptureStdout,RejectIoReqs,
+				     Msg,From,Func),
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
 				  Comment,CurrConf,Status);
         {io_request,From,ReplyAs,{put_chars,io_lib,Func,[Format,Args]}}
 	when is_atom(Format) ->
 	    Msg = (catch io_lib:Func(Format,Args)),
-	    run_test_case_msgloop_io(ReplyAs,CaptureStdout,Msg,From,Func),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+	    run_test_case_msgloop_io(From,ReplyAs,CaptureStdout,RejectIoReqs,
+				     Msg,From,Func),
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
 				  Comment,CurrConf,Status);
         {io_request,From,ReplyAs,{put_chars,Bytes}} ->
-	    run_test_case_msgloop_io(
-	      ReplyAs,CaptureStdout,Bytes,From,put_chars),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+	    run_test_case_msgloop_io(From,ReplyAs,CaptureStdout,RejectIoReqs,
+				     Bytes,From,put_chars),
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
 				  Comment,CurrConf,Status);
         {io_request,From,ReplyAs,{put_chars,unicode,io_lib,Func,[Format,Args]}}
 	when is_list(Format) ->
 	    Msg = unicode_to_latin1(catch io_lib:Func(Format,Args)),
-	    run_test_case_msgloop_io(ReplyAs,CaptureStdout,Msg,From,Func),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+	    run_test_case_msgloop_io(From,ReplyAs,CaptureStdout,RejectIoReqs,
+				     Msg,From,Func),
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
 				  Comment,CurrConf,Status);
         {io_request,From,ReplyAs,{put_chars,latin1,io_lib,Func,[Format,Args]}}
 	when is_list(Format) ->
 	    Msg = (catch io_lib:Func(Format,Args)),
-	    run_test_case_msgloop_io(ReplyAs,CaptureStdout,Msg,From,Func),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+	    run_test_case_msgloop_io(From,ReplyAs,CaptureStdout,RejectIoReqs,
+				     Msg,From,Func),
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
 				  Comment,CurrConf,Status);
         {io_request,From,ReplyAs,{put_chars,unicode,io_lib,Func,[Format,Args]}}
 	when is_atom(Format) ->
 	    Msg = unicode_to_latin1(catch io_lib:Func(Format,Args)),
-	    run_test_case_msgloop_io(ReplyAs,CaptureStdout,Msg,From,Func),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+	    run_test_case_msgloop_io(From,ReplyAs,CaptureStdout,RejectIoReqs,
+				     Msg,From,Func),
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
 				  Comment,CurrConf,Status);
         {io_request,From,ReplyAs,{put_chars,latin1,io_lib,Func,[Format,Args]}}
 	when is_atom(Format) ->
 	    Msg = (catch io_lib:Func(Format,Args)),
-	    run_test_case_msgloop_io(ReplyAs,CaptureStdout,Msg,From,Func),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+	    run_test_case_msgloop_io(From,ReplyAs,CaptureStdout,RejectIoReqs,
+				     Msg,From,Func),
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
 				  Comment,CurrConf,Status);
         {io_request,From,ReplyAs,{put_chars,unicode,Bytes}} ->
-	    run_test_case_msgloop_io(
-	      ReplyAs,CaptureStdout,unicode_to_latin1(Bytes),From,put_chars),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+	    run_test_case_msgloop_io(From,ReplyAs,CaptureStdout,RejectIoReqs,
+				     unicode_to_latin1(Bytes),From,put_chars),
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
 				  Comment,CurrConf,Status);
         {io_request,From,ReplyAs,{put_chars,latin1,Bytes}} ->
-	    run_test_case_msgloop_io(
-	      ReplyAs,CaptureStdout,Bytes,From,put_chars),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+	    run_test_case_msgloop_io(From,ReplyAs,CaptureStdout,RejectIoReqs,
+				     Bytes,From,put_chars),
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
 				  Comment,CurrConf,Status);
         IoReq when element(1, IoReq) == io_request ->
 	    %% something else, just pass it on
             group_leader() ! IoReq,
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
 				  Comment,CurrConf,Status);
 	{structured_io,ClientPid,Msg} ->
 	    output(Msg, ClientPid),
-            run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+            run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
 				  Comment,CurrConf,Status);
 	{capture,NewCapture} ->
-            run_test_case_msgloop(Ref,Pid,NewCapture,Terminate,
+            run_test_case_msgloop(Ref,Pid,NewCapture,RejectIoReqs,Terminate,
 				  Comment,CurrConf,Status);
 	{sync_apply,From,MFA} ->
 	    sync_local_or_remote_apply(false,From,MFA),
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
 				  Comment,CurrConf,Status);
 	{sync_apply_proxy,Proxy,From,MFA} ->
 	    sync_local_or_remote_apply(Proxy,From,MFA),
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
 				  Comment,CurrConf,Status);
 	{printout,Detail,Format,Args} ->
 	    print(Detail,Format,Args),
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
 				  Comment,CurrConf,Status);
 	{comment,NewComment} ->
 	    NewComment1 = test_server_ctrl:to_string(NewComment),
@@ -783,18 +802,20 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
 		    Other ->
 			Other
 		end,
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate1,
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate1,
 				  NewComment2,CurrConf,Status);
 	{read_comment,From} ->
 	    From ! {self(),read_comment,Comment},
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
 				  Comment,CurrConf,Status);
 	{set_curr_conf,From,NewCurrConf} ->
 	    From ! {self(),set_curr_conf,ok},
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
 				  Comment,NewCurrConf,Status);
 	{make_priv_dir,From} when CurrConf == undefined ->
-	    From ! {self(),make_priv_dir,{error,no_priv_dir_in_config}};
+	    From ! {self(),make_priv_dir,{error,no_priv_dir_in_config}},
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
+				  Comment,CurrConf,Status);
 	{make_priv_dir,From} ->
 	    Result =
 		case proplists:get_value(priv_dir, element(2, CurrConf)) of
@@ -811,12 +832,12 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
 			end
 		end,
 	    From ! {self(),make_priv_dir,Result},
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,Terminate,
 				  Comment,CurrConf,Status);
 	{'EXIT',Pid,{Ref,Time,Value,Loc,Opts}} ->
 	    RetVal = {Time/1000000,Value,mod_loc(Loc),Opts,Comment},
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,{true,RetVal},
-				  Comment,undefined,Status);
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,
+				  {true,RetVal},Comment,undefined,Status);
 	{'EXIT',Pid,Reason} ->
 	    case Reason of
 		{timetrap_timeout,TVal,Loc} ->
@@ -827,7 +848,8 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
 			    spawn_fw_call(FwMod,FwFunc,CurrConf,Pid,
 					  {framework_error,{timetrap,TVal}},
 					  unknown,self()),
-			    run_test_case_msgloop(Ref,Pid,CaptureStdout,
+			    run_test_case_msgloop(Ref,Pid,
+						  CaptureStdout,RejectIoReqs,
 						  Terminate,Comment,
 						  undefined,Status);
 			Loc1 ->
@@ -860,7 +882,8 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
 						      Loc1,self()),
 					undefined
 				end,
-			    run_test_case_msgloop(Ref,Pid,CaptureStdout,
+			    run_test_case_msgloop(Ref,Pid,
+						  CaptureStdout,RejectIoReqs,
 						  Terminate,Comment,
 						  NewCurrConf,Status)
 		    end;
@@ -877,15 +900,16 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
 					  {timetrap_timeout,TVal},
 					  Loc1,self())
 		    end,
-		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-					  Comment,CurrConf,Status);
+		    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,
+					  Terminate,Comment,CurrConf,Status);
 		{testcase_aborted,ErrorMsg={user_timetrap_error,_},AbortLoc} ->
 		    %% user timetrap function caused exit
 		    %% during start of test case
 		    {Mod,Func} = get_mf(mod_loc(AbortLoc)),
 		    spawn_fw_call(Mod,Func,CurrConf,Pid,
 				  ErrorMsg,unknown,self()),
-		    run_test_case_msgloop(Ref,Pid,CaptureStdout,
+		    run_test_case_msgloop(Ref,Pid,
+					  CaptureStdout,RejectIoReqs,
 					  Terminate,Comment,
 					  undefined,Status);		
 		{testcase_aborted,AbortReason,AbortLoc} ->
@@ -896,7 +920,8 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
 			    spawn_fw_call(FwMod,FwFunc,CurrConf,Pid,
 					  {framework_error,ErrorMsg},
 					  unknown,self()),
-			    run_test_case_msgloop(Ref,Pid,CaptureStdout,
+			    run_test_case_msgloop(Ref,Pid,
+						  CaptureStdout,RejectIoReqs,
 						  Terminate,Comment,
 						  undefined,Status);
 			Loc1 ->
@@ -928,7 +953,8 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
 						      ErrorMsg,Loc1,self()),
 					undefined
 				end,
-			    run_test_case_msgloop(Ref,Pid,CaptureStdout,
+			    run_test_case_msgloop(Ref,Pid,
+						  CaptureStdout,RejectIoReqs,
 						  Terminate,Comment,
 						  NewCurrConf,Status)
 		    end;
@@ -943,14 +969,14 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
 		    spawn_fw_call(Mod,Func,CurrConf,Pid,
 				  testcase_aborted_or_killed,
 				  unknown,self()),
-		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-					  Comment,CurrConf,Status);
+		    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,
+					  Terminate,Comment,CurrConf,Status);
 		{fw_error,{FwMod,FwFunc,FwError}} ->
 		    spawn_fw_call(FwMod,FwFunc,CurrConf,Pid,
 				  {framework_error,FwError},
 				  unknown,self()),
-		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-					  Comment,CurrConf,Status);
+		    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,
+					  Terminate,Comment,CurrConf,Status);
 		_Other ->
 		    %% the testcase has terminated because of Reason (e.g. an exit
 		    %% because a linked process failed)
@@ -960,8 +986,8 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
 				 end,
 		    spawn_fw_call(Mod,Func,CurrConf,Pid,
 				  Reason,unknown,self()),
-		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-					  Comment,CurrConf,Status)
+		    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,
+					  Terminate,Comment,CurrConf,Status)
 	    end;
 	{EndConfPid,{call_end_conf,Data,_Result}} ->
 	    case CurrConf of
@@ -969,11 +995,11 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
 		    {_Mod,_Func,TCPid,TCExitReason,Loc} = Data,
 		    spawn_fw_call(Mod,Func,CurrConf,TCPid,
 				  TCExitReason,Loc,self()),
-		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-					  Comment,undefined,Status);
+		    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,
+					  Terminate,Comment,undefined,Status);
 		_ ->
-		    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-					  Comment,CurrConf,Status)
+		    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,
+					  Terminate,Comment,CurrConf,Status)
 	    end;
 	{_FwCallPid,fw_notify_done,{T,Value,Loc,Opts,AddToComment}} ->
 	    %% the framework has been notified, we're finished
@@ -993,8 +1019,8 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
 			    end,
 			{T,Value,Loc,Opts,Comment1}
 		end,
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,{true,RetVal},
-				  Comment,undefined,Status);
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,
+				  {true,RetVal},Comment,undefined,Status);
  	{'EXIT',_FwCallPid,{fw_notify_done,Func,Error}} ->
 	    %% a framework function failed
 	    CB = os:getenv("TEST_SERVER_FRAMEWORK"),
@@ -1005,13 +1031,13 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
 			  {list_to_atom(CB),Func}
 		  end,
 	    RetVal = {died,{framework_error,Loc,Error},Loc,"Framework error"},
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,{true,RetVal},
-				  Comment,undefined,Status);
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,
+				  {true,RetVal},Comment,undefined,Status);
 	{failed,File,Line} ->
 	    put(test_server_detected_fail,
 		[{File, Line}| get(test_server_detected_fail)]),
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,
+				  Terminate,Comment,CurrConf,Status);
 
 	{user_timetrap,Pid,_TrapTime,StartTime,E={user_timetrap_error,_},_} ->
 	    case update_user_timetraps(Pid, StartTime) of
@@ -1020,8 +1046,8 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
 		ignore ->
 		    ok
 	    end,
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,
+				  Terminate,Comment,CurrConf,Status);
 	{user_timetrap,Pid,TrapTime,StartTime,ElapsedTime,Scale} ->
 	    %% a user timetrap is triggered, ignore it if new
 	    %% timetrap has been started since
@@ -1036,49 +1062,57 @@ run_test_case_msgloop(Ref, Pid, CaptureStdout, Terminate,
 		ignore ->
 		    ok
 	    end,
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,
+				  Terminate,Comment,CurrConf,Status);
 	{timetrap_cancel_one,Handle,_From} ->
 	    timetrap_cancel_one(Handle, false),
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,
+				  Terminate,Comment,CurrConf,Status);
 	{timetrap_cancel_all,TCPid,_From} ->
 	    timetrap_cancel_all(TCPid, false),
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,
+				  Terminate,Comment,CurrConf,Status);
 	{get_timetrap_info,TCPid,From} ->
 	    Info = get_timetrap_info(TCPid, false),
 	    From ! {self(),get_timetrap_info,Info},
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,
+				  Terminate,Comment,CurrConf,Status);
 	_Other when not is_tuple(_Other) ->
 	    %% ignore anything not generated by test server
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status);
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,
+				  Terminate,Comment,CurrConf,Status);
 	_Other when element(1, _Other) /= 'EXIT',
 		    element(1, _Other) /= started,
 		    element(1, _Other) /= finished,
 		    element(1, _Other) /= print ->
 	    %% ignore anything not generated by test server
-	    run_test_case_msgloop(Ref,Pid,CaptureStdout,Terminate,
-				  Comment,CurrConf,Status)
+	    run_test_case_msgloop(Ref,Pid,CaptureStdout,RejectIoReqs,
+				  Terminate,Comment,CurrConf,Status)
     after Timeout ->
 	    ReturnValue
     end.
 
-run_test_case_msgloop_io(ReplyAs,CaptureStdout,Msg,From,Func) ->
+run_test_case_msgloop_io(From,ReplyAs,CaptureStdout,RejectIoReqs,
+			 Msg,From,Func) ->
     case Msg of
 	{'EXIT',_} ->
 	    From ! {io_reply,ReplyAs,{error,Func}};
 	_ ->
 	    From ! {io_reply,ReplyAs,ok}
     end,
-    if  CaptureStdout /= false ->
-	    CaptureStdout ! {captured,Msg};
-	true ->
+    Proceed = if RejectIoReqs -> get({permit_io,From});
+		 true        -> true
+	      end,
+    if Proceed ->
+	    if CaptureStdout /= false ->
+		    CaptureStdout ! {captured,Msg};
+	       true ->
+		    ok
+	    end,
+	    output({minor,Msg},From);
+       true ->
 	    ok
-    end,
-    output({minor,Msg},From).
+    end.
 
 output(Msg,Sender) ->
     local_or_remote_apply({test_server_ctrl,output,[Msg,Sender]}).
@@ -1959,6 +1993,13 @@ messages_get() ->
     test_server_sup:messages_get([]).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% permit_io(GroupLeader, FromPid) -> ok
+%%
+%% Make sure proceeding IO from FromPid won't get rejected
+permit_io(GroupLeader, FromPid) ->
+    GroupLeader ! {permit_io,FromPid}.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% sleep(Time) -> ok
 %% Time = integer() | float() | infinity
 %%
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index 5ed296d215..a340cd629f 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -162,7 +162,7 @@
 -export([jobs/0, run_test/1, wait_finish/0, idle_notify/1,
 	 abort_current_testcase/1, abort/0]).
 -export([start_get_totals/1, stop_get_totals/0]).
--export([get_levels/0, set_levels/3]).
+-export([reject_io_reqs/1, get_levels/0, set_levels/3]).
 -export([multiply_timetraps/1, scale_timetraps/1, get_timetrap_parameters/0]).
 -export([create_priv_dir/1]).
 -export([cover/2, cover/3, cover/7,
@@ -219,7 +219,7 @@
 -define(auto_skip_color, "#FFA64D").
 -define(user_skip_color, "#FF8000").
 
--record(state,{jobs=[],levels={1,19,10},
+-record(state,{jobs=[], levels={1,19,10}, reject_io_reqs=false,
 	       multiply_timetraps=1, scale_timetraps=true,
 	       create_priv_dir=auto_per_run, finish=false,
 	       target_info, trc=false, cover=false, wait_for_node=[],
@@ -498,6 +498,9 @@ get_levels() ->
 set_levels(Show, Major, Minor) ->
     controller_call({set_levels,Show,Major,Minor}).
 
+reject_io_reqs(Bool) ->
+    controller_call({reject_io_reqs,Bool}).
+
 multiply_timetraps(N) ->
     controller_call({multiply_timetraps,N}).
 
@@ -815,6 +818,7 @@ handle_call({add_job,Dir,Name,TopCase,Skip}, _From, State) ->
 			    [SpecName,{State#state.multiply_timetraps,
 				       State#state.scale_timetraps}],
 			    LogDir, Name, State#state.levels,
+			    State#state.reject_io_reqs,
 			    State#state.create_priv_dir,
 			    State#state.testcase_callback, ExtraTools1),
 		    NewJobs = [{Name,Pid}|State#state.jobs],
@@ -825,6 +829,7 @@ handle_call({add_job,Dir,Name,TopCase,Skip}, _From, State) ->
 			    [SpecList,{State#state.multiply_timetraps,
 				       State#state.scale_timetraps}],
 			    LogDir, Name, State#state.levels,
+			    State#state.reject_io_reqs,
 			    State#state.create_priv_dir,
 			    State#state.testcase_callback, ExtraTools1),
 		    NewJobs = [{Name,Pid}|State#state.jobs],
@@ -843,6 +848,7 @@ handle_call({add_job,Dir,Name,TopCase,Skip}, _From, State) ->
 				     {State#state.multiply_timetraps,
 				      State#state.scale_timetraps}],
 				    LogDir, Name, State#state.levels,
+				    State#state.reject_io_reqs,
 				    State#state.create_priv_dir,
 				    State#state.testcase_callback, ExtraTools1),
 			    NewJobs = [{Name,Pid}|State#state.jobs],
@@ -975,6 +981,15 @@ handle_call({set_levels,Show,Major,Minor}, _From, State) ->
     {reply,ok,State#state{levels={Show,Major,Minor}}};
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% handle_call({reject_io_reqs,Bool}, _, State) -> ok
+%% Bool = bool()
+%%
+%% May be used to switch off stdout printouts to the minor log file
+
+handle_call({reject_io_reqs,Bool}, _From, State) ->
+    {reply,ok,State#state{reject_io_reqs=Bool}};
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% handle_call({multiply_timetraps,N}, _, State) -> ok
 %% N = integer() | infinity
 %%
@@ -1340,14 +1355,15 @@ kill_all_jobs([]) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% spawn_tester(Mod, Func, Args, Dir, Name, Levels, CreatePrivDir,
-%%              TestCaseCallback, ExtraTools) -> Pid
+%% spawn_tester(Mod, Func, Args, Dir, Name, Levels, RejectIoReqs,
+%%              CreatePrivDir, TestCaseCallback, ExtraTools) -> Pid
 %% Mod = atom()
 %% Func = atom()
 %% Args = [term(),...]
 %% Dir = string()
 %% Name = string()
 %% Levels = {integer(),integer(),integer()}
+%% RejectIoReqs = bool()
 %% CreatePrivDir = auto_per_run | manual_per_tc | auto_per_tc
 %% TestCaseCallback = {CBMod,CBFunc} | undefined
 %% ExtraTools = [ExtraTool,...]
@@ -1359,14 +1375,14 @@ kill_all_jobs([]) ->
 %% When the named function is done executing, a summary of the results
 %% is printed to the log files.
 
-spawn_tester(Mod, Func, Args, Dir, Name, Levels, 
+spawn_tester(Mod, Func, Args, Dir, Name, Levels, RejectIoReqs,
 	     CreatePrivDir, TCCallback, ExtraTools) ->
     spawn_link(
-      fun() -> init_tester(Mod, Func, Args, Dir, Name, Levels,
+      fun() -> init_tester(Mod, Func, Args, Dir, Name, Levels, RejectIoReqs,
 			   CreatePrivDir, TCCallback, ExtraTools)
       end).
 
-init_tester(Mod, Func, Args, Dir, Name, {SumLev,MajLev,MinLev},
+init_tester(Mod, Func, Args, Dir, Name, {SumLev,MajLev,MinLev}, RejectIoReqs,
 	    CreatePrivDir, TCCallback, ExtraTools) ->
     process_flag(trap_exit, true),
     put(test_server_name, Name),
@@ -1378,6 +1394,7 @@ init_tester(Mod, Func, Args, Dir, Name, {SumLev,MajLev,MinLev},
     put(test_server_summary_level, SumLev),
     put(test_server_major_level, MajLev),
     put(test_server_minor_level, MinLev),
+    put(test_server_reject_io_reqs, RejectIoReqs),
     put(test_server_create_priv_dir, CreatePrivDir),
     put(test_server_random_seed, proplists:get_value(random_seed, ExtraTools)),
     put(test_server_testcase_callback, TCCallback),
@@ -1486,7 +1503,7 @@ stop_extra_tools([], _) ->
 %% Reads the named test suite specification file, and executes it.
 %%
 %% This function is meant to be called by a process created by
-%% spawn_tester/7, which sets up some necessary dictionary values.
+%% spawn_tester/10, which sets up some necessary dictionary values.
 
 do_spec(SpecName, TimetrapSpec) when is_list(SpecName) ->
     case file:consult(SpecName) of
@@ -1535,7 +1552,7 @@ do_spec(SpecName, TimetrapSpec) when is_list(SpecName) ->
 %% should not be used. Use a configuration test case instead.
 %%
 %% This function is meant to be called by a process created by
-%% spawn_tester/7, which sets up some necessary dictionary values.
+%% spawn_tester/10, which sets up some necessary dictionary values.
 
 do_spec_list(TermList0, TimetrapSpec) ->
     Nodes = [],
@@ -1702,7 +1719,7 @@ add_mod(Mod, Mods) ->
 %% configuration information into the log files.
 %%
 %% This function is meant to be called by a process created by
-%% spawn_tester/7, which sets up some necessary dictionary values.
+%% spawn_tester/10, which sets up some necessary dictionary values.
 do_test_cases(TopCases, SkipCases,
 	      Config, MultiplyTimetrap) when is_integer(MultiplyTimetrap);
 					     MultiplyTimetrap == infinity ->
@@ -3809,10 +3826,12 @@ run_test_case1(Ref, Num, Mod, Func, Args, RunInit, Where,
 	   MinorBase,MinorBase]),
 
     do_if_parallel(Main, ok, fun erlang:yield/0),
+
+    RejectIoReqs = get(test_server_reject_io_reqs),
     %% run the test case
     {Result,DetectedFail,ProcsBefore,ProcsAfter} =
 	run_test_case_apply(Num, Mod, Func, [UpdatedArgs], get_name(Mode),
-			    RunInit, Where, TimetrapData),
+			    RunInit, Where, TimetrapData, RejectIoReqs),
     {Time,RetVal,Loc,Opts,Comment} =
 	case Result of
 	    Normal={_Time,_RetVal,_Loc,_Opts,_Comment} -> Normal;
@@ -4431,7 +4450,7 @@ do_format_exception(Reason={Error,Stack}) ->
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% run_test_case_apply(CaseNum, Mod, Func, Args, Name, RunInit,
-%%                     Where, TimetrapData) ->
+%%                     Where, TimetrapData, RejectIoReqs) ->
 %%  {{Time,RetVal,Loc,Opts,Comment},DetectedFail,ProcessesBefore,ProcessesAfter} |
 %%  {{died,Reason,unknown,Comment},DetectedFail,ProcessesBefore,ProcessesAfter}
 %% Name = atom()
@@ -4450,19 +4469,21 @@ do_format_exception(Reason={Error,Stack}) ->
 %% sent over socket to target, and test_server runs the case and sends the
 %% result back over the socket. Else test_server runs the case directly on host.
 
-run_test_case_apply(CaseNum, Mod, Func, Args, Name, RunInit, host, TimetrapData) ->
+run_test_case_apply(CaseNum, Mod, Func, Args, Name, RunInit, host,
+		    TimetrapData, RejectIoReqs) ->
     test_server:run_test_case_apply({CaseNum,Mod,Func,Args,Name,RunInit,
-				     TimetrapData});
-run_test_case_apply(CaseNum, Mod, Func, Args, Name, RunInit, target, TimetrapData) ->
+				     TimetrapData,RejectIoReqs});
+run_test_case_apply(CaseNum, Mod, Func, Args, Name, RunInit, target,
+		    TimetrapData, RejectIoReqs) ->
     case get(test_server_ctrl_job_sock) of
 	undefined ->
 	    %% local target
 	    test_server:run_test_case_apply({CaseNum,Mod,Func,Args,Name,RunInit,
-					     TimetrapData});
+					     TimetrapData,RejectIoReqs});
 	JobSock ->
 	    %% remote target
 	    request(JobSock, {test_case,{CaseNum,Mod,Func,Args,Name,RunInit,
-					 TimetrapData}}),
+					 TimetrapData,RejectIoReqs}}),
 	    read_job_sock_loop(JobSock)
     end.