Merge branch 'peppe/common_test/misc_18.3_bugfixes' into maint

* peppe/common_test/misc_18.3_bugfixes:
  Fix minor issues with escaping characters

OTP-13003

7 files changed, 62 insertions, 34 deletions

diff --git a/lib/common_test/src/ct.erl b/lib/common_test/src/ct.erl
index 1c1b46c2af..538be514d6 100644
--- a/lib/common_test/src/ct.erl
+++ b/lib/common_test/src/ct.erl
@@ -591,7 +591,7 @@ log(X1,X2,X3,X4) ->
 %%%      Format = string()
 %%%      Args = list()
 %%%      Opts = [Opt]
-%%%      Opt = esc_chars
+%%%      Opt = esc_chars | no_css
 %%%
 %%% @doc Printout from a test case to the log file. 
 %%%
diff --git a/lib/common_test/src/ct_conn_log_h.erl b/lib/common_test/src/ct_conn_log_h.erl
index 93f358462d..034906a3ba 100644
--- a/lib/common_test/src/ct_conn_log_h.erl
+++ b/lib/common_test/src/ct_conn_log_h.erl
@@ -105,52 +105,62 @@ terminate(_,#state{logs=Logs}) ->
 %%% Writing reports
 write_report(_Time,#conn_log{header=false,module=ConnMod}=Info,Data,GL,State) ->
     case get_log(Info,GL,State) of
-	{silent,_} ->
+	{silent,_,_} ->
 	    ok;
-	{LogType,Fd} ->
-	    io:format(Fd,"~n~ts",[format_data(ConnMod,LogType,Data)])
+	{LogType,Dest,Fd} ->
+	    Str = if LogType == html, Dest == gl -> ["$tc_html","~n~ts"];
+		     true                        -> "~n~ts"
+		  end,
+	    io:format(Fd,Str,[format_data(ConnMod,LogType,Data)])
     end;
 
 write_report(Time,#conn_log{module=ConnMod}=Info,Data,GL,State) ->
     case get_log(Info,GL,State) of
-	{silent,_} ->
+	{silent,_,_} ->
 	    ok;
-	{LogType,Fd} ->
+	{LogType,Dest,Fd} ->
 	    case format_data(ConnMod,LogType,Data) of
 		[] when Info#conn_log.action==send; Info#conn_log.action==recv ->
 		    ok;
 		FormattedData ->
-		    io:format(Fd,"~n~ts~ts~ts",[format_head(ConnMod,LogType,Time),
-						format_title(LogType,Info),
-						FormattedData])
+		    Str = if LogType == html, Dest == gl ->
+				  ["$tc_html","~n~ts~ts~ts"];
+			     true ->
+				  "~n~ts~ts~ts"
+			  end,
+		    io:format(Fd,Str,[format_head(ConnMod,LogType,Time),
+				      format_title(LogType,Info),
+				      FormattedData])
 	    end
     end.
 
 write_error(Time,#conn_log{module=ConnMod}=Info,Report,GL,State) ->
     case get_log(Info,GL,State) of
-	{LogType,_} when LogType==html; LogType==silent ->
+	{LogType,_,_} when LogType==html; LogType==silent ->
 	    %% The error will anyway be written in the html log by the
 	    %% sasl error handler, so don't write it again.
 	    ok;
-	{LogType,Fd} ->
-	    io:format(Fd,"~n~ts~ts~ts",
-		      [format_head(ConnMod,LogType,Time," ERROR"),
-		       format_title(LogType,Info),
-		       format_error(LogType,Report)])
+	{LogType,Dest,Fd} ->
+	    Str = if LogType == html, Dest == gl -> ["$tc_html","~n~ts~ts~ts"];
+		     true                        -> "~n~ts~ts~ts"
+		  end,
+	    io:format(Fd,Str,[format_head(ConnMod,LogType,Time," ERROR"),
+			      format_title(LogType,Info),
+			      format_error(LogType,Report)])
     end.
 
 get_log(Info,GL,State) ->
     case proplists:get_value(GL,State#state.logs) of
 	undefined ->
-	    {html,State#state.default_gl};
+	    {html,gl,State#state.default_gl};
 	ConnLogs ->
 	    case proplists:get_value(Info#conn_log.module,ConnLogs) of
 		{html,_} ->
-		    {html,GL};
+		    {html,gl,GL};
 		{LogType,Fds} ->
-		    {LogType,get_fd(Info,Fds)};
+		    {LogType,file,get_fd(Info,Fds)};
 		undefined ->
-		    {html,GL}
+		    {html,gl,GL}
 	    end
     end.
 
diff --git a/lib/common_test/src/ct_logs.erl b/lib/common_test/src/ct_logs.erl
index e3f995ad3f..4920383f39 100644
--- a/lib/common_test/src/ct_logs.erl
+++ b/lib/common_test/src/ct_logs.erl
@@ -432,10 +432,16 @@ tc_log(Category,Importance,Format,Args,Opts) ->
 %%% stuff directly from a testcase (i.e. not from within the CT
 %%% framework).</p>
 tc_log(Category,Importance,Printer,Format,Args,Opts) ->
-    cast({log,sync,self(),group_leader(),Category,Importance,
-	  [{hd,div_header(Category,Printer),[]},
-	   {Format,Args},
-	   {ft,div_footer(),[]}],
+    Data = 
+	case lists:member(no_css, Opts) of
+	    true ->
+		[{Format,Args}];
+	    false ->
+		[{hd,div_header(Category,Printer),[]},
+		 {Format,Args},
+		 {ft,div_footer(),[]}]
+	end,
+    cast({log,sync,self(),group_leader(),Category,Importance,Data,
 	  lists:member(esc_chars, Opts)}),
     ok.
 
diff --git a/lib/common_test/src/cth_conn_log.erl b/lib/common_test/src/cth_conn_log.erl
index 9b3dc0b5f1..954b4239af 100644
--- a/lib/common_test/src/cth_conn_log.erl
+++ b/lib/common_test/src/cth_conn_log.erl
@@ -132,7 +132,7 @@ pre_init_per_testcase(TestCase,Config,CthState) ->
 				 [S,ct_logs:uri(L),filename:basename(L)])
 			       || {S,L} <- Ls] ++
 			      "</table>",
-			  io:format(Str,[]),
+			  ct:log(Str,[],[no_css]),
 			  {ConnMod,{LogType,Ls}};
 		      _ ->
 			  {ConnMod,{LogType,[]}}
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index 248ec6c4df..8e7ac9395c 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -1228,8 +1228,8 @@ log_events(TC, Events, EvLogDir, Opts) ->
     file:close(Dev),
     FullLogFile = join_abs_dirs(proplists:get_value(net_dir, Opts),
 				LogFile),
-    io:format("Events written to logfile: <a href=\"file://~s\">~s</a>~n",
-	      [FullLogFile,FullLogFile]),
+    ct:log("Events written to logfile: <a href=\"file://~s\">~s</a>~n",
+	   [FullLogFile,FullLogFile],[no_css]),
     io:format(user, "Events written to logfile: ~p~n", [LogFile]).
 
 log_events1(Evs, Dev, "") ->
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index 958fe1a2b7..e0975ab744 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -1825,13 +1825,14 @@ start_minor_log_file1(Mod, Func, LogDir, AbsName, MFA) ->
 	    case {filelib:is_file(filename:join(LogDir, SrcListing)),
 		  lists:member(no_src, get(test_server_logopts))} of
 		{true,false} ->
-		    print(Lev, Info ++ "<a href=\"~ts#~ts\">~w:~w/~w</a> "
-			  "(click for source code)\n",
+		    print(Lev, ["$tc_html",
+				Info ++ "<a href=\"~ts#~ts\">~w:~w/~w</a> "
+				"(click for source code)\n"],
 			  [uri_encode(SrcListing),
 			   uri_encode(atom_to_list(Func)++"-1",utf8),
 			   Mod,Func,Arity]);
 		_ ->
-		    print(Lev, Info ++ "~w:~w/~w\n", [Mod,Func,Arity])
+		    print(Lev, ["$tc_html",Info ++ "~w:~w/~w\n"], [Mod,Func,Arity])
 	    end
     end,
 
@@ -4356,6 +4357,10 @@ print(Detail, Format) ->
 print(Detail, Format, Args) ->
     print(Detail, Format, Args, internal).
 
+print(Detail, ["$tc_html",Format], Args, Printer) ->
+    Msg = io_lib:format(Format, Args),
+    print_or_buffer(Detail, ["$tc_html",Msg], Printer);
+
 print(Detail, Format, Args, Printer) ->
     Msg = io_lib:format(Format, Args),
     print_or_buffer(Detail, Msg, Printer).
diff --git a/lib/test_server/src/test_server_gl.erl b/lib/test_server/src/test_server_gl.erl
index 6abc68db54..0acc73047c 100644
--- a/lib/test_server/src/test_server_gl.erl
+++ b/lib/test_server/src/test_server_gl.erl
@@ -37,7 +37,8 @@
 	     reject_io :: boolean(),	       %Reject I/O requests...
 	     permit_io,			       %... and exceptions
 	     auto_nl=true :: boolean(),	       %Automatically add NL
-	     levels			       %{Stdout,Major,Minor}
+	     levels,			       %{Stdout,Major,Minor}
+	     escape_chars=true		       %Switch escaping HTML on/off
 	    }).
 
 %% start_link()
@@ -137,7 +138,8 @@ init([]) ->
 	    reject_io=false,
 	    permit_io=gb_sets:empty(),
 	    auto_nl=true,
-	    levels={1,19,10}
+	    levels={1,19,10},
+	    escape_chars=true
 	   }}.
 
 req(GL, Req) ->
@@ -193,10 +195,11 @@ handle_info({io_request,From,ReplyAs,Req}=IoReq, St) ->
 			#st{capture=CapturePid} ->
 			    CapturePid ! {captured,Data}
 		    end,
-		    if EscapeHtml ->			    
+		    case EscapeHtml andalso St#st.escape_chars of
+			true ->
 			    output(minor, test_server_ctrl:escape_chars(Data),
 				   From, From, St);
-		       not EscapeHtml ->
+			false ->
 			    output(minor, Data, From, From, St)
 		    end
 	    end,
@@ -218,7 +221,11 @@ handle_info({printout,Detail,Fun}, St) when is_function(Fun)->
     {noreply,St};
 handle_info({printout,Detail,Format,Args}, St) ->
     Str = io_lib:format(Format, Args),
-    output(Detail, Str, internal, none, St),
+    if not St#st.escape_chars ->
+	    output(Detail, ["$tc_html",Str], internal, none, St);
+       true ->
+	    output(Detail, Str, internal, none, St)
+    end,
     {noreply,St};
 handle_info(Msg, #st{tc_supervisor=Pid}=St) when is_pid(Pid) ->
     %% The process overseeing the testcase process also used to be