common_test: header option for cth_conn_log hook module

lib/common_test/src/ct_conn_log_h.erl

@@ -30,17 +30,18 @@
 -export([init/1,
 	 handle_event/2, handle_call/2, handle_info/2,
 	 terminate/2]).
-
--record(state, {logs=[], default_gl}).
+-record(state, {logs=[], default_gl, header=false}).
 
 -define(WIDTH,80).
 
 -define(now, os:timestamp()).
 
 %%%-----------------------------------------------------------------
 %%% Callbacks
-init({GL,ConnLogs}) ->
-    open_files(GL,ConnLogs,#state{default_gl=GL}).
+init({GL,ConnLogs,Opts}) ->
+    open_files(GL,ConnLogs,
+               #state{default_gl = GL,
+                      header = proplists:get_value(header, Opts, false)}).
 
 open_files(GL,[{ConnMod,{LogType,LogFiles}}|T],State=#state{logs=Logs}) ->
     case do_open_files(LogFiles,[]) of
@@ -103,6 +104,9 @@ terminate(_,#state{logs=Logs}) ->
 
 %%%-----------------------------------------------------------------
 %%% Writing reports
+write_report(Time,#conn_log{header=false,module=ConnMod}=Info,Data,GL,
+             #state{header=true}=State) ->
+    write_report_with_header(Info, GL, State, ConnMod, Data, Time);
 write_report(_Time,#conn_log{header=false,module=ConnMod}=Info,Data,GL,State) ->
     case get_log(Info,GL,State) of
 	{silent,_,_} ->
@@ -113,8 +117,10 @@ write_report(_Time,#conn_log{header=false,module=ConnMod}=Info,Data,GL,State) ->
 		  end,
 	    io:format(Fd,Str,[format_data(ConnMod,LogType,Data)])
     end;
-
 write_report(Time,#conn_log{module=ConnMod}=Info,Data,GL,State) ->
+    write_report_with_header(Info, GL, State, ConnMod, Data, Time).
+
+write_report_with_header(Info, GL, State, ConnMod, Data, Time) ->
     case get_log(Info,GL,State) of
 	{silent,_,_} ->
 	    ok;

lib/common_test/src/cth_conn_log.erl

@@ -91,12 +91,13 @@ get_log_opts(Mod,Opts) ->
 		     end,
     LogType = proplists:get_value(log_type,Opts,DefaultLogType),
     Hosts = proplists:get_value(hosts,Opts,[]),
-    {LogType,Hosts}.
+    {LogType,Hosts,[{header, proplists:get_value(header,Opts,false)}]}.
 
 pre_init_per_testcase(_Suite,TestCase,Config,CthState) ->
+    {_, _, CtTelnetOpts} = proplists:get_value(ct_telnet, CthState, {null, null, []}),
     Logs =
 	lists:map(
-	  fun({ConnMod,{LogType,Hosts}}) ->		  
+	  fun({ConnMod,{LogType,Hosts, _Opts}}) ->
 		  ct_util:set_testdata({{?MODULE,ConnMod},LogType}),
 		  case LogType of
 		      LogType when LogType==raw; LogType==pretty ->
@@ -128,11 +129,11 @@ pre_init_per_testcase(_Suite,TestCase,Config,CthState) ->
 		  end
 	  end,
 	  CthState),
-
     GL = group_leader(),
     Update =
 	fun(Init) when Init == undefined; Init == [] ->
-		error_logger:add_report_handler(ct_conn_log_h,{GL,Logs}),
+		error_logger:add_report_handler(ct_conn_log_h,
+                                                {GL,Logs,CtTelnetOpts}),
 		[TestCase];
 	   (PrevUsers) ->
 		error_logger:info_report(update,{GL,Logs}),

lib/common_test/test/ct_telnet_SUITE_data/ct_telnet_own_server_SUITE.erl

@@ -29,10 +29,9 @@
 %%--------------------------------------------------------------------
 
 suite() ->
-    [
-     {require,telnet_server_conn1,{unix,[telnet]}},
+    [{require,telnet_server_conn1,{unix,[telnet]}},
      {require,ct_conn_log},
-     {ct_hooks, [{cth_conn_log,[]}]}
+     {ct_hooks, [{cth_conn_log,[{ct_telnet, [{header, true}]}]}]}
     ].
 
 all() ->