2 files changed, 12 insertions, 19 deletions
diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index f7266e5632..88d86285d5 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -4686,21 +4686,16 @@ output_to_fd(stdout, Msg, Sender) ->
     io:format("Testing ~s: ~s\n", [Name, lists:flatten(Msg)]);
 output_to_fd(undefined, _Msg, _Sender) ->
     ok;
-output_to_fd(Fd, [$=|Msg], internal) ->
-    io:put_chars(Fd, [$=]),
-    io:put_chars(Fd, Msg),
-    io:put_chars(Fd, "\n");
+output_to_fd(Fd, Msg=[$=|_], internal) ->
+    io:put_chars(Fd, [Msg,"\n"]);
 
 output_to_fd(Fd, Msg, internal) ->
-    io:put_chars(Fd, [$=,$=,$=,$ ]),
-    io:put_chars(Fd, Msg),
-    io:put_chars(Fd, "\n");
+    io:put_chars(Fd, [$=,$=,$=,$ , Msg, "\n"]);
 
 output_to_fd(Fd, Msg, _Sender) ->
-    io:put_chars(Fd, Msg),
     case get(test_server_log_nl) of
-	false -> ok;
-	_     -> io:put_chars(Fd, "\n")
+	false -> io:put_chars(Fd, Msg);
+	_     -> io:put_chars(Fd, [Msg,"\n"])
     end.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -5834,11 +5829,11 @@ write_default_cross_coverlog(TestDir) ->
     {ok,CrossCoverLog} =
 	file:open(filename:join(TestDir,?cross_coverlog_name), [write]),
     write_coverlog_header(CrossCoverLog),
-    io:fwrite(CrossCoverLog,
-	      ["No cross cover modules exist for this application,",
-	       xhtml("<br>","<br />"),
-	       "or cross cover analysis is not completed.\n"
-	       "</body></html>\n"], []),
+    io:put_chars(CrossCoverLog,
+		 ["No cross cover modules exist for this application,",
+		  xhtml("<br>","<br />"),
+		  "or cross cover analysis is not completed.\n"
+		  "</body></html>\n"]),
     file:close(CrossCoverLog).
 
 write_cover_result_table(CoverLog,Coverage) ->
diff --git a/lib/test_server/src/test_server_sup.erl b/lib/test_server/src/test_server_sup.erl
index 9d111ff769..4a27c1ebae 100644
--- a/lib/test_server/src/test_server_sup.erl
+++ b/lib/test_server/src/test_server_sup.erl
@@ -473,10 +473,8 @@ getenv_any([]) -> "".
 %%
 %% Returns the OS family
 get_os_family() ->
-    case os:type() of
-	{OsFamily,_OsName} -> OsFamily;
-	OsFamily -> OsFamily
-    end.
+    {OsFamily,_OsName} = os:type(),
+    OsFamily.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%