From 332e0ac6d422588b6f6087569057a0c11c388763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Thu, 6 Dec 2012 07:35:56 +0100
Subject: test_server: Remove support for packages

---
 lib/test_server/src/test_server_sup.erl | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

(limited to 'lib/test_server/src/test_server_sup.erl')

diff --git a/lib/test_server/src/test_server_sup.erl b/lib/test_server/src/test_server_sup.erl
index c7553cccb5..a6d426887e 100644
--- a/lib/test_server/src/test_server_sup.erl
+++ b/lib/test_server/src/test_server_sup.erl
@@ -28,7 +28,7 @@
 	 get_username/0, get_os_family/0, 
 	 hostatom/0, hostatom/1, hoststr/0, hoststr/1,
 	 framework_call/2,framework_call/3,framework_call/4,
-	 format_loc/1, package_str/1, package_atom/1,
+	 format_loc/1,
 	 call_trace/1]).
 -include("test_server_internal.hrl").
 -define(crash_dump_tar,"crash_dumps.tar.gz").
@@ -553,7 +553,7 @@ format_loc([{Mod,Func,Line}|Rest]) ->
 format_loc([{Mod,LineOrFunc}]) ->
     format_loc({Mod,LineOrFunc});
 format_loc({Mod,Func}) when is_atom(Func) -> 
-    io_lib:format("{~s,~w}",[package_str(Mod),Func]);
+    io_lib:format("{~w,~w}",[Mod,Func]);
 format_loc(Loc) ->
     io_lib:format("~p",[Loc]).    
 
@@ -562,15 +562,15 @@ format_loc1([{Mod,Func,Line}]) ->
 format_loc1([{Mod,Func,Line}|Rest]) ->
     ["              ",format_loc1({Mod,Func,Line}),",\n"|format_loc1(Rest)];
 format_loc1({Mod,Func,Line}) ->
-    ModStr = package_str(Mod),
+    ModStr = atom_to_list(Mod),
     case {lists:member(no_src, get(test_server_logopts)),
 	  lists:reverse(ModStr)} of
 	{false,[$E,$T,$I,$U,$S,$_|_]}  ->
-	    io_lib:format("{~s,~w,<a href=\"~s~s#~w\">~w</a>}",
-			  [ModStr,Func,downcase(ModStr),?src_listing_ext,
+	    io_lib:format("{~w,~w,<a href=\"~s~s#~w\">~w</a>}",
+			  [Mod,Func,downcase(ModStr),?src_listing_ext,
 			   Line,Line]);
 	_ ->
-	    io_lib:format("{~s,~w,~w}",[ModStr,Func,Line])
+	    io_lib:format("{~w,~w,~w}",[Mod,Func,Line])
     end.
 
 downcase(S) -> downcase(S, []).
@@ -581,22 +581,6 @@ downcase([C|Rest], Result) ->
 downcase([], Result) ->
     lists:reverse(Result).
 
-package_str(Mod) when is_atom(Mod) ->
-    atom_to_list(Mod);
-package_str(Mod) when is_list(Mod), is_atom(hd(Mod)) ->
-    %% convert [s1,s2] -> "s1.s2"
-    [_|M] = lists:flatten(["."++atom_to_list(S) || S <- Mod]),
-    M;
-package_str(Mod) when is_list(Mod) ->
-    Mod.
-
-package_atom(Mod) when is_atom(Mod) ->
-    Mod;
-package_atom(Mod) when is_list(Mod), is_atom(hd(Mod)) ->
-    list_to_atom(package_str(Mod));
-package_atom(Mod) when is_list(Mod) ->
-    list_to_atom(Mod).
-
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% call_trace(TraceSpecFile) -> ok
 %%
-- 
cgit v1.2.3