Merge branch 'maint'

5 files changed, 38 insertions, 13 deletions

diff --git a/lib/common_test/priv/ct_default.css b/lib/common_test/priv/ct_default.css
index 1188f8f676..ff48b4fdc0 100644
--- a/lib/common_test/priv/ct_default.css
+++ b/lib/common_test/priv/ct_default.css
@@ -96,6 +96,14 @@ div.ct_error_notify {
     margin: .2em 0 0 0;
 }
 
+div.ct_error_notify a:link {
+    color: #D0D0D0;
+}
+
+div.ct_error_notify a:visited {
+    color: #AAAAAA;
+}
+
 div.default { 
     background: lightgreen; color: black; 
     font-family: "Monaco", "Andale Mono", "Consolas", monospace;
diff --git a/lib/common_test/src/ct_framework.erl b/lib/common_test/src/ct_framework.erl
index b92fe1555f..276f902b05 100644
--- a/lib/common_test/src/ct_framework.erl
+++ b/lib/common_test/src/ct_framework.erl
@@ -32,6 +32,7 @@
 -export([error_in_suite/1, init_per_suite/1, end_per_suite/1,
 	 init_per_group/2, end_per_group/2]).
 
+-include("ct.hrl").
 -include("ct_event.hrl").
 -include("ct_util.hrl").
 
@@ -806,8 +807,14 @@ error_notification(Mod,Func,_Args,{Error,Loc}) ->
 			   "- - - - - - - - - -~n",
 		       io:format(user, lists:concat([Div,ErrFormat,Div,"~n"]),
 				 ErrArgs),
-		       ct_logs:tc_log(ct_error_notify, "CT Error Notification",
-				      ErrFormat, ErrArgs)
+		       Link =
+			   "\n\n<a href=\"#end\">"
+			   "Full error description and stacktrace"
+			   "</a>",
+		       ct_logs:tc_log(ct_error_notify,
+				      ?MAX_IMPORTANCE,
+				      "CT Error Notification",
+				      ErrFormat++Link, ErrArgs)
 	       end,
     case Loc of
 	[{?MODULE,error_in_suite}] ->
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index 79db1ae65c..1f8160ff03 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -41,7 +41,8 @@
 -export([uri/1]).
 
 %% Logging stuff directly from testcase
--export([tc_log/3, tc_log/4, tc_log_async/3, tc_print/3, tc_print/4,
+-export([tc_log/3, tc_log/4, tc_log/5, tc_log_async/3, tc_log_async/5,
+	 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
@@ -364,8 +365,15 @@ tc_log(Category,Format,Args) ->
 
 %%%-----------------------------------------------------------------
 %%% @spec tc_log(Category,Importance,Format,Args) -> ok
+%%% @equiv tc_log(Category,Importance,"User",Format,Args)
+tc_log(Category,Importance,Format,Args) ->
+    tc_log(Category,Importance,"User",Format,Args).
+
+%%%-----------------------------------------------------------------
+%%% @spec tc_log(Category,Importance,Printer,Format,Args) -> ok
 %%%      Category = atom()
 %%%      Importance = integer()
+%%%      Printer = string()
 %%%      Format = string()
 %%%      Args = list()
 %%%
@@ -374,9 +382,6 @@ tc_log(Category,Format,Args) ->
 %%% <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,Importance,Format,Args) ->
-    tc_log(Category,Importance,"User",Format,Args).
-
 tc_log(Category,Importance,Printer,Format,Args) ->
     cast({log,sync,self(),group_leader(),Category,Importance,
 	  [{div_header(Category,Printer),[]},
@@ -386,14 +391,15 @@ tc_log(Category,Importance,Printer,Format,Args) ->
 
 %%%-----------------------------------------------------------------
 %%% @spec tc_log_async(Category,Format,Args) -> ok
-%%% @equiv tc_log_async(Category,?STD_IMPORTANCE,Format,Args)
+%%% @equiv tc_log_async(Category,?STD_IMPORTANCE,"User",Format,Args)
 tc_log_async(Category,Format,Args) ->
-    tc_log_async(Category,?STD_IMPORTANCE,Format,Args).
+    tc_log_async(Category,?STD_IMPORTANCE,"User",Format,Args).
 
 %%%-----------------------------------------------------------------
 %%% @spec tc_log_async(Category,Importance,Format,Args) -> ok
 %%%      Category = atom()
 %%%      Importance = integer()
+%%%      Printer = string()
 %%%      Format = string()
 %%%      Args = list()
 %%%
@@ -404,9 +410,9 @@ tc_log_async(Category,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,Importance,Format,Args) ->
+tc_log_async(Category,Importance,Printer,Format,Args) ->
     cast({log,async,self(),group_leader(),Category,Importance,
-	  [{div_header(Category),[]},
+	  [{div_header(Category,Printer),[]},
 	   {Format,Args},
 	   {div_footer(),[]}]}),
     ok.
diff --git a/lib/common_test/src/ct_util.erl b/lib/common_test/src/ct_util.erl
index 02e58d0786..6a8b37bf3b 100644
--- a/lib/common_test/src/ct_util.erl
+++ b/lib/common_test/src/ct_util.erl
@@ -414,6 +414,8 @@ loop(Mode,TestData,StartDir) ->
 		[#conn{address=A,callback=CB}] ->
 		    %% A connection crashed - remove the connection but don't die
 		    ct_logs:tc_log_async(ct_error_notify,
+					 ?MAX_IMPORTANCE,
+					 "CT Error Notification",
 					 "Connection process died: "
 					 "Pid: ~w, Address: ~p, Callback: ~w\n"
 					 "Reason: ~p\n\n",
diff --git a/lib/common_test/src/cth_log_redirect.erl b/lib/common_test/src/cth_log_redirect.erl
index 78ae70f37e..958b7a94c7 100644
--- a/lib/common_test/src/cth_log_redirect.erl
+++ b/lib/common_test/src/cth_log_redirect.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2013. 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
@@ -33,6 +33,8 @@
 	 handle_event/2, handle_call/2, handle_info/2,
 	 terminate/1]).
 
+-include("ct.hrl").
+
 id(_Opts) ->
     ?MODULE.
 
@@ -78,7 +80,7 @@ handle_event(Event, LogFunc) ->
 	    SReport = sasl_report:format_report(group_leader(), ErrLogType,
 						tag_event(Event)),
 	    if is_list(SReport) ->
-		    ct_logs:LogFunc(sasl, SReport, []);
+		    ct_logs:LogFunc(sasl, ?STD_IMPORTANCE, "System", SReport, []);
 	       true -> %% Report is an atom if no logging is to be done
 		    ignore
 	    end
@@ -86,7 +88,7 @@ handle_event(Event, LogFunc) ->
     EReport = error_logger_tty_h:write_event(
 		tag_event(Event),io_lib),
     if is_list(EReport) ->
-	    ct_logs:LogFunc(error_logger, EReport, []);
+	    ct_logs:LogFunc(error_logger, ?STD_IMPORTANCE, "System", EReport, []);
        true -> %% Report is an atom if no logging is to be done
 	    ignore
     end,