From d599c41d10447dc5872db3e86d1899ff122bfb6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 26 Sep 2012 10:20:24 +0200
Subject: Fix obsolete assumption for the return type of os:type/0

os:type/0 could (a long, long time ago) return atoms such as
'vxworks' instead of a two-tuple.
---
 lib/test_server/src/test_server_sup.erl | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lib')

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.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-- 
cgit v1.2.3


From f957943503936c9b91c7ab9a24cae050b7ab5381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 19 Sep 2012 15:55:53 +0200
Subject: test_server_ctrl: Don't use undocumented features of io:format()

The Format string argument for io:format/3 is not documented
to accept an iolist, so we should not depend on it. Fix the
problem by using io:put_chars/2 instead.
---
 lib/test_server/src/test_server_ctrl.erl | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/test_server/src/test_server_ctrl.erl b/lib/test_server/src/test_server_ctrl.erl
index f7266e5632..7b3ccd5338 100644
--- a/lib/test_server/src/test_server_ctrl.erl
+++ b/lib/test_server/src/test_server_ctrl.erl
@@ -5834,11 +5834,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) ->
-- 
cgit v1.2.3