From 701918817ce0e9ea3d49b54d250066da76095010 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Tue, 25 Jan 2011 13:24:55 +0100
Subject: Update remote loading to only load a certain number of modules at a
 time to prevent memory usage explosion

---
 lib/tools/src/cover.erl | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

(limited to 'lib/tools')

diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index c4d1bd1d2f..4cc78403e1 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -972,14 +972,25 @@ remote_start(MainNode) ->
 	    {error,{already_started,Pid}}
     end.
 
-%% Load a set of cover compiled modules on remote nodes
-remote_load_compiled(Nodes,Compiled0) ->
-    Compiled = lists:map(fun get_data_for_remote_loading/1,Compiled0),
+%% Load a set of cover compiled modules on remote nodes,
+%% We do it ?MAX_MODS modules at a time so that we don't
+%% run out of memory on the cover_server node. 
+-define(MAX_MODS, 10).
+remote_load_compiled(Nodes,Compiled) ->
+    remote_load_compiled(Nodes, Compiled, [], 0).
+remote_load_compiled(_Nodes, [], [], _ModNum) ->
+    ok;
+remote_load_compiled(Nodes, Compiled, Acc, ModNum) 
+  when Compiled == []; ModNum == ?MAX_MODS ->
     lists:foreach(
       fun(Node) -> 
-	      remote_call(Node,{remote,load_compiled,Compiled})
+	      remote_call(Node,{remote,load_compiled,Acc})
       end,
-      Nodes).
+      Nodes),
+    remote_load_compiled(Nodes, Compiled, [], 0);
+remote_load_compiled(Nodes, [MF | Rest], Acc, ModNum) ->
+    remote_load_compiled(
+      Nodes, Rest, [get_data_for_remote_loading(MF) | Acc], ModNum + 1).
 
 %% Read all data needed for loading a cover compiled module on a remote node
 %% Binary is the beam code for the module and InitialTable is the initial
@@ -993,8 +1004,8 @@ get_data_for_remote_loading({Module,File}) ->
 %% Create a match spec which returns the clause info {Module,InitInfo} and 
 %% all #bump keys for the given module with 0 number of calls.
 ms(Module) ->
-    ets:fun2ms(fun({Module,InitInfo})  -> 
-		       {Module,InitInfo};
+    ets:fun2ms(fun({Mod,InitInfo})  -> 
+		       {Mod,InitInfo};
 		  ({Key,_}) when is_record(Key,bump),Key#bump.module=:=Module -> 
 		       {Key,0}
 	       end).
-- 
cgit v1.2.3


From 8f3148df7809a67a8ebf7a9762f4c85c2611a9f3 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Wed, 26 Jan 2011 20:09:09 +0100
Subject: Refactor cover to prepare it for making analysis parallel

---
 lib/tools/src/cover.erl | 321 ++++++++++++++++++++++++++----------------------
 1 file changed, 171 insertions(+), 150 deletions(-)

(limited to 'lib/tools')

diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index 4cc78403e1..128aa84831 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -500,6 +500,8 @@ remote_call(Node,Request) ->
 	    Return
     end.
     
+remote_reply(Proc,Reply) when is_pid(Proc) ->
+    Proc ! {?SERVER,Reply};
 remote_reply(MainNode,Reply) ->
     {?SERVER,MainNode} ! {?SERVER,Reply}.
 
@@ -593,40 +595,10 @@ main_process_loop(State) ->
 	    end;
 
 	{From, {export,OutFile,Module}} ->
-	    case file:open(OutFile,[write,binary,raw]) of
-		{ok,Fd} ->
-		    Reply = 
-			case Module of
-			    '_' ->
-				export_info(State#main_state.imported),
-				collect(State#main_state.nodes),
-				do_export_table(State#main_state.compiled,
-						State#main_state.imported,
-						Fd);
-			    _ ->
-				export_info(Module,State#main_state.imported),
-				case is_loaded(Module, State) of
-				    {loaded, File} ->
-					[{Module,Clauses}] = 
-					    ets:lookup(?COVER_TABLE,Module),
-					collect(Module, Clauses,
-						State#main_state.nodes),
-					do_export_table([{Module,File}],[],Fd);
-				    {imported, File, ImportFiles} ->
-					%% don't know if I should allow this - 
-					%% export a module which is only imported
-					Imported = [{Module,File,ImportFiles}],
-					do_export_table([],Imported,Fd);
-				    _NotLoaded ->
-					{error,{not_cover_compiled,Module}}
-				end
-			end,
-		    file:close(Fd),
-		    reply(From, Reply);
-		{error,Reason} ->
-		    reply(From, {error, {cant_open_file,OutFile,Reason}})
-	    
-	    end,
+	    spawn(fun() ->
+			  io:format(user, "EXPORTING: ~p to ~p~n",[Module, OutFile]),
+			  do_export(Module, OutFile, From, State)
+		  end),
 	    main_process_loop(State);
 	
 	{From, {import,File}} ->
@@ -692,107 +664,95 @@ main_process_loop(State) ->
             unregister(?SERVER),
 	    reply(From, ok);
 
-	{From, {Request, Module}} ->
-	    case is_loaded(Module, State) of
-		{loaded, File} ->
-		    {Reply,State1} = 
-			case Request of
-			    {analyse, Analysis, Level} ->
-				analyse_info(Module,State#main_state.imported),
+	{From, {{analyse, Analysis, Level}, Module}} ->
+	    S = try 
+		    Loaded = is_loaded(Module, State),
+		    analyse_info(Module,State#main_state.imported),
+		    C = case Loaded of
+			    {loaded, _File} ->
 				[{Module,Clauses}] = 
 				    ets:lookup(?COVER_TABLE,Module),
 				collect(Module,Clauses,State#main_state.nodes),
-				R = do_analyse(Module, Analysis, Level, Clauses),
-				{R,State};
-			    
-			    {analyse_to_file, OutFile, Opts} ->
-				R = case find_source(File) of
-					{beam,_BeamFile} ->
-					    {error,no_source_code_found};
-					ErlFile ->
-					    Imported = State#main_state.imported,
-					    analyse_info(Module,Imported),
-					    [{Module,Clauses}] = 
-						ets:lookup(?COVER_TABLE,Module),
-					    collect(Module, Clauses,
-						    State#main_state.nodes),
-					    HTML = lists:member(html,Opts),
-					    do_analyse_to_file(Module,OutFile,
-							       ErlFile,HTML)
-				    end,
-				{R,State};
-			    
-			    is_compiled ->
-				{{file, File},State};
-			    
-			    reset ->
-				R = do_reset_main_node(Module,
-						       State#main_state.nodes),
-				Imported = 
-				    remove_imported(Module,
-						    State#main_state.imported),
-				{R,State#main_state{imported=Imported}}
-			end,
-		    reply(From, Reply),
-		    main_process_loop(State1);
-		
-		{imported,File,_ImportFiles} ->
-		    {Reply,State1} = 
-			case Request of
-			    {analyse, Analysis, Level} ->
-				analyse_info(Module,State#main_state.imported),
+				Clauses;
+			    _ ->
 				[{Module,Clauses}] = 
 				    ets:lookup(?COLLECTION_TABLE,Module),
-				R = do_analyse(Module, Analysis, Level, Clauses),
-				{R,State};
-			    
-			    {analyse_to_file, OutFile, Opts} ->
-				R = case find_source(File) of
-					{beam,_BeamFile} ->
-					    {error,no_source_code_found};
-					ErlFile ->
-					    Imported = State#main_state.imported,
-					    analyse_info(Module,Imported),
-					    HTML = lists:member(html,Opts),
-					    do_analyse_to_file(Module,OutFile,
-							   ErlFile,HTML)
-				    end,
-				{R,State};
-			    
-			    is_compiled ->
-				{false,State};
-			    
-			    reset ->
-				R = do_reset_collection_table(Module),
-				Imported = 
-				    remove_imported(Module,
-						    State#main_state.imported),
-				{R,State#main_state{imported=Imported}}
+				Clauses
 			end,
-		    reply(From, Reply),
-		    main_process_loop(State1);		    
-		
-		NotLoaded ->
-		    Reply = 
-			case Request of
-			    is_compiled ->
-				false;
-			    _ ->
-				{error, {not_cover_compiled,Module}}
-			end,
-		    Compiled = 
-			case NotLoaded of
-			    unloaded ->
-				do_clear(Module),
-				remote_unload(State#main_state.nodes,[Module]),
-				update_compiled([Module],
-						State#main_state.compiled);
-			    false ->
-				State#main_state.compiled
+		    R = do_analyse(Module, Analysis, Level, C),
+		    reply(From, R),
+		    State
+		catch throw:Reason ->
+			reply(From,{error, {not_cover_compiled,Module}}),
+			not_loaded(Module, Reason, State)
+		end,
+	    main_process_loop(S);
+
+	{From, {{analyse_to_file, OutFile, Opts},Module}} ->
+	    S = try 
+		    Loaded = is_loaded(Module, State),
+		    File = case Loaded of
+			{loaded, File0} ->
+			    [{Module,Clauses}] = 
+				ets:lookup(?COVER_TABLE,Module),
+			    collect(Module, Clauses,
+				    State#main_state.nodes),
+			    File0;
+			{imported, File0, _} ->
+			    File0
+		    end,
+		    case find_source(File) of
+			{beam,_BeamFile} ->
+			    reply(From, {error,no_source_code_found}),
+			    State;
+			ErlFile ->
+			    analyse_info(Module,State#main_state.imported),
+			    HTML = lists:member(html,Opts),
+			    R = do_analyse_to_file(Module,OutFile,
+						   ErlFile,HTML),
+			    reply(From, R),
+			    State
+		    end
+		catch throw:Reason ->
+			reply(From,{error, {not_cover_compiled,Module}}),
+			not_loaded(Module, Reason, State)
+		end,
+	    main_process_loop(S);
+
+	{From, {is_compiled, Module}} ->
+	    S = try is_loaded(Module, State) of
+		    {loaded, File} ->
+			reply(From,{file, File}),
+			State;
+		    {imported,_File,_ImportFiles} ->
+			reply(From,false),
+			State
+		catch throw:Reason ->
+			reply(From,false),
+			not_loaded(Module, Reason, State)
+		end,
+	    main_process_loop(S);
+
+	{From, {reset, Module}} ->
+	    S = try 
+		    Loaded = is_loaded(Module,State),
+		    R = case Loaded of
+			    {loaded, _File} ->
+				do_reset_main_node(
+				  Module, State#main_state.nodes);
+			    {imported, _File, _} ->
+				do_reset_collection_table(Module)
 			end,
-		    reply(From, Reply),
-		    main_process_loop(State#main_state{compiled=Compiled})
-	    end;
+		    Imported = 
+			remove_imported(Module,
+					State#main_state.imported),
+		    reply(From, R),
+		    State#main_state{imported=Imported}
+		catch throw:Reason ->
+			reply(From,{error, {not_cover_compiled,Module}}),
+			not_loaded(Module, Reason, State)
+		end,
+	    main_process_loop(S);		    
 	
 	{'EXIT',Pid,_Reason} ->
 	    %% Exit is trapped on the main node only, so this will only happen 
@@ -807,10 +767,6 @@ main_process_loop(State) ->
 	    main_process_loop(State)
     end.
 
-
-
-
-
 %%%----------------------------------------------------------------------
 %%% cover_server on remote node
 %%%----------------------------------------------------------------------
@@ -843,6 +799,10 @@ remote_process_loop(State) ->
 	    remote_process_loop(State);
 
 	{remote,collect,Module,CollectorPid} ->
+	    self() ! {remote,collect,Module,CollectorPid, ?SERVER};
+
+	{remote,collect,Module,CollectorPid,From} ->
+%	    spawn(?MODULE, do_remote_collect, [Module, CollectorPid]),
 	    MS = 
 		case Module of
 		    '_' -> ets:fun2ms(fun({M,C}) when is_atom(M) -> C end);
@@ -865,7 +825,7 @@ remote_process_loop(State) ->
 	      end,
 	      AllClauses),
 	    CollectorPid ! done,
-	    remote_reply(State#remote_state.main_node, ok),
+	    remote_reply(From, ok),
 	    remote_process_loop(State);
 
 	{remote,stop} ->
@@ -1028,27 +988,37 @@ remote_reset(Module,Nodes) ->
 
 %% Collect data from remote nodes - used for analyse or stop(Node)
 remote_collect(Module,Nodes,Stop) ->
-    CollectorPid = spawn(fun() -> collector_proc(length(Nodes)) end),
-    lists:foreach(
-      fun(Node) -> 
-	      remote_call(Node,{remote,collect,Module,CollectorPid}),
-	      if Stop -> remote_call(Node,{remote,stop});
-		 true -> ok
-	      end
-      end,
-      Nodes).
+    Pids = lists:map(
+	     fun(Node) -> 
+		     spawn(fun() -> 
+				   do_collection(Node, Module, Stop)
+			   end)
+	     end,
+	     Nodes),
+    RefsNPids = [{erlang:monitor(process, Pid),Pid} || Pid <- Pids],
+    lists:foreach(fun({Ref,Pid}) ->
+			  receive
+			      {'DOWN', Ref, process, Pid, _} ->
+				  ok
+			  end
+		  end,RefsNPids).
+
+do_collection(Node, Module, Stop) ->
+    CollectorPid = spawn(fun collector_proc/0),
+    remote_call(Node,{remote,collect,Module,CollectorPid, self()}),
+    if Stop -> remote_call(Node,{remote,stop});
+       true -> ok
+    end.
 
 %% Process which receives chunks of data from remote nodes - either when
 %% analysing or when stopping cover on the remote nodes.
-collector_proc(0) ->
-    ok;
-collector_proc(N) ->
+collector_proc() ->
     receive 
 	{chunk,Chunk} ->
 	    insert_in_collection_table(Chunk),
-	    collector_proc(N);
+	    collector_proc();
 	done ->
-	    collector_proc(N-1)
+	    ok
     end.
 
 insert_in_collection_table([{Key,Val}|Chunk]) ->
@@ -1063,7 +1033,13 @@ insert_in_collection_table(Key,Val) ->
 	    ets:update_counter(?COLLECTION_TABLE,
 			       Key,Val);
 	false ->
-	    ets:insert(?COLLECTION_TABLE,{Key,Val})
+	    %% Make sure that there are no race conditions from ets:member
+	    case ets:insert_new(?COLLECTION_TABLE,{Key,Val}) of
+		false ->
+		    insert_in_collection_table(Key,Val);
+		_ ->
+		    ok
+	    end
     end.
 
 
@@ -1164,14 +1140,14 @@ is_loaded(Module, State) ->
 	{ok, File} ->
 	    case code:which(Module) of
 		?TAG -> {loaded, File};
-		_ -> unloaded
+		_ -> throw(unloaded)
 	    end;
 	false ->
 	    case get_file(Module,State#main_state.imported) of
 		{ok,File,ImportFiles} ->
 		    {imported, File, ImportFiles};
 		false ->
-		    false
+		    throw(not_loaded)
 	    end
     end.
 
@@ -2038,6 +2014,42 @@ fill2() ->       ".|  ".
 fill3() ->        "|  ".
 
 %%%--Export--------------------------------------------------------------
+do_export(Module, OutFile, From, State) ->
+    case file:open(OutFile,[write,binary,raw]) of
+	{ok,Fd} ->
+	    Reply = 
+		case Module of
+		    '_' ->
+			export_info(State#main_state.imported),
+			collect(State#main_state.nodes),
+			do_export_table(State#main_state.compiled,
+					State#main_state.imported,
+					Fd);
+		    _ ->
+			export_info(Module,State#main_state.imported),
+			try is_loaded(Module, State) of
+			    {loaded, File} ->
+				[{Module,Clauses}] = 
+				    ets:lookup(?COVER_TABLE,Module),
+				collect(Module, Clauses,
+					State#main_state.nodes),
+				do_export_table([{Module,File}],[],Fd);
+			    {imported, File, ImportFiles} ->
+				%% don't know if I should allow this - 
+				%% export a module which is only imported
+				Imported = [{Module,File,ImportFiles}],
+				do_export_table([],Imported,Fd)
+			catch throw:_ ->
+				{error,{not_cover_compiled,Module}}
+			end
+		end,
+	    file:close(Fd),
+	    reply(From, Reply);
+	{error,Reason} ->
+	    reply(From, {error, {cant_open_file,OutFile,Reason}})
+
+    end.
+
 do_export_table(Compiled, Imported, Fd) ->
     ModList = merge(Imported,Compiled),
     write_module_data(ModList,Fd).
@@ -2164,6 +2176,15 @@ do_clear(Module) ->
     ets:match_delete(?COVER_TABLE, {#bump{module=Module},'_'}),
     ets:match_delete(?COLLECTION_TABLE, {#bump{module=Module},'_'}).
 
+not_loaded(Module, unloaded, State) ->
+    do_clear(Module),
+    remote_unload(State#main_state.nodes,[Module]),
+    Compiled = update_compiled([Module],
+			       State#main_state.compiled),
+    State#main_state{ compiled = Compiled };
+not_loaded(_Module,_Else, State) ->
+    State.
+
 
 
 %%%--Div-----------------------------------------------------------------
-- 
cgit v1.2.3


From 3a4ed77a4b8d29ec6889e60a56e440c7db440628 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Wed, 26 Jan 2011 20:21:34 +0100
Subject: Update cover to allow multiple analyse and analyze_to_file calls at
 the same time. For each call a seperate process will be spawned to handle the
 request.

---
 lib/tools/src/cover.erl | 86 ++++++++++++++++++++++++++++---------------------
 1 file changed, 49 insertions(+), 37 deletions(-)

(limited to 'lib/tools')

diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index 128aa84831..b8cb8e58cf 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -596,7 +596,6 @@ main_process_loop(State) ->
 
 	{From, {export,OutFile,Module}} ->
 	    spawn(fun() ->
-			  io:format(user, "EXPORTING: ~p to ~p~n",[Module, OutFile]),
 			  do_export(Module, OutFile, From, State)
 		  end),
 	    main_process_loop(State);
@@ -667,20 +666,11 @@ main_process_loop(State) ->
 	{From, {{analyse, Analysis, Level}, Module}} ->
 	    S = try 
 		    Loaded = is_loaded(Module, State),
-		    analyse_info(Module,State#main_state.imported),
-		    C = case Loaded of
-			    {loaded, _File} ->
-				[{Module,Clauses}] = 
-				    ets:lookup(?COVER_TABLE,Module),
-				collect(Module,Clauses,State#main_state.nodes),
-				Clauses;
-			    _ ->
-				[{Module,Clauses}] = 
-				    ets:lookup(?COLLECTION_TABLE,Module),
-				Clauses
-			end,
-		    R = do_analyse(Module, Analysis, Level, C),
-		    reply(From, R),
+		    spawn(fun() ->
+				  do_parallel_analysis(
+				    Module, Analysis, Level, 
+				    Loaded, From, State)
+			  end),
 		    State
 		catch throw:Reason ->
 			reply(From,{error, {not_cover_compiled,Module}}),
@@ -691,28 +681,12 @@ main_process_loop(State) ->
 	{From, {{analyse_to_file, OutFile, Opts},Module}} ->
 	    S = try 
 		    Loaded = is_loaded(Module, State),
-		    File = case Loaded of
-			{loaded, File0} ->
-			    [{Module,Clauses}] = 
-				ets:lookup(?COVER_TABLE,Module),
-			    collect(Module, Clauses,
-				    State#main_state.nodes),
-			    File0;
-			{imported, File0, _} ->
-			    File0
-		    end,
-		    case find_source(File) of
-			{beam,_BeamFile} ->
-			    reply(From, {error,no_source_code_found}),
-			    State;
-			ErlFile ->
-			    analyse_info(Module,State#main_state.imported),
-			    HTML = lists:member(html,Opts),
-			    R = do_analyse_to_file(Module,OutFile,
-						   ErlFile,HTML),
-			    reply(From, R),
-			    State
-		    end
+		    spawn(fun() ->
+				  do_parallel_analysis_to_file(
+				    Module, OutFile, Opts, 
+				    Loaded, From, State)
+			  end),
+		    State
 		catch throw:Reason ->
 			reply(From,{error, {not_cover_compiled,Module}}),
 			not_loaded(Module, Reason, State)
@@ -1842,6 +1816,22 @@ find_source(File0) ->
 	    end
     end.
 
+do_parallel_analysis(Module, Analysis, Level, Loaded, From, State) ->
+    analyse_info(Module,State#main_state.imported),
+    C = case Loaded of
+	    {loaded, _File} ->
+		[{Module,Clauses}] = 
+		    ets:lookup(?COVER_TABLE,Module),
+		collect(Module,Clauses,State#main_state.nodes),
+		Clauses;
+	    _ ->
+		[{Module,Clauses}] = 
+		    ets:lookup(?COLLECTION_TABLE,Module),
+		Clauses
+	end,
+    R = do_analyse(Module, Analysis, Level, C),
+    reply(From, R).
+
 %% do_analyse(Module, Analysis, Level, Clauses)-> {ok,Answer} | {error,Error}
 %%   Clauses = [{Module,Function,Arity,Clause,Lines}]
 do_analyse(Module, Analysis, line, _Clauses) ->
@@ -1918,6 +1908,28 @@ merge_functions([{_MFA,R}|Functions], MFun, Result) ->
 merge_functions([], _MFun, Result) ->
     Result.
 
+do_parallel_analysis_to_file(Module, OutFile, Opts, Loaded, From, State) ->
+    File = case Loaded of
+	       {loaded, File0} ->
+		   [{Module,Clauses}] = 
+		       ets:lookup(?COVER_TABLE,Module),
+		   collect(Module, Clauses,
+			   State#main_state.nodes),
+		   File0;
+	       {imported, File0, _} ->
+		   File0
+	   end,
+    case find_source(File) of
+	{beam,_BeamFile} ->
+	    reply(From, {error,no_source_code_found});
+	ErlFile ->
+	    analyse_info(Module,State#main_state.imported),
+	    HTML = lists:member(html,Opts),
+	    R = do_analyse_to_file(Module,OutFile,
+				   ErlFile,HTML),
+	    reply(From, R)
+    end.
+
 %% do_analyse_to_file(Module,OutFile,ErlFile) -> {ok,OutFile} | {error,Error}
 %%   Module = atom()
 %%   OutFile = ErlFile = string()
-- 
cgit v1.2.3


From 976ce69a8ada40e6b2e4664fc48d5f430e4ea1f2 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Thu, 27 Jan 2011 11:14:07 +0100
Subject: Remove io printout warnings when exporting an imported module

---
 lib/tools/src/cover.erl | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'lib/tools')

diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index b8cb8e58cf..689a702d52 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -1034,14 +1034,15 @@ analyse_info(Module,Imported) ->
 
 export_info(_Module,[]) ->
     ok;
-export_info(Module,Imported) ->
-    imported_info("Export",Module,Imported).
+export_info(_Module,_Imported) ->
+    %% Do not print that the export includes imported modules
+    ok.
 
 export_info([]) ->
     ok;
-export_info(Imported) ->
-    AllImportFiles = get_all_importfiles(Imported,[]),
-    io:format("Export includes data from imported files\n~p\n",[AllImportFiles]).
+export_info(_Imported) ->
+    %% Do not print that the export includes imported modules
+    ok.
 
 get_all_importfiles([{_M,_F,ImportFiles}|Imported],Acc) ->
     NewAcc = do_get_all_importfiles(ImportFiles,Acc),
-- 
cgit v1.2.3


From a74c4f6e655543c70179b8dc507d51e5603c7e30 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Thu, 27 Jan 2011 12:08:46 +0100
Subject: Update remote collect to handle multiple requests at once

---
 lib/tools/src/cover.erl | 53 ++++++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 25 deletions(-)

(limited to 'lib/tools')

diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index 689a702d52..48ab91db9c 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -776,30 +776,9 @@ remote_process_loop(State) ->
 	    self() ! {remote,collect,Module,CollectorPid, ?SERVER};
 
 	{remote,collect,Module,CollectorPid,From} ->
-%	    spawn(?MODULE, do_remote_collect, [Module, CollectorPid]),
-	    MS = 
-		case Module of
-		    '_' -> ets:fun2ms(fun({M,C}) when is_atom(M) -> C end);
-		    _ -> ets:fun2ms(fun({M,C}) when M=:=Module -> C end)
-		end,
-	    AllClauses = lists:flatten(ets:select(?COVER_TABLE,MS)),
-	    
-	    %% Sending clause by clause in order to avoid large lists
-	    lists:foreach(
-	      fun({M,F,A,C,_L}) ->
-		      Pattern = 
-			  {#bump{module=M, function=F, arity=A, clause=C}, '_'},
-		      Bumps = ets:match_object(?COVER_TABLE, Pattern),
-		      %% Reset
-		      lists:foreach(fun({Bump,_N}) ->
-					    ets:insert(?COVER_TABLE, {Bump,0})
-				    end,
-				    Bumps),
-		      CollectorPid ! {chunk,Bumps}
-	      end,
-	      AllClauses),
-	    CollectorPid ! done,
-	    remote_reply(From, ok),
+	   spawn(fun() ->
+			 do_collect(Module, CollectorPid, From)
+		 end),
 	    remote_process_loop(State);
 
 	{remote,stop} ->
@@ -828,6 +807,30 @@ remote_process_loop(State) ->
 	    
     end.
 
+do_collect(Module, CollectorPid, From) ->
+    MS = 
+	case Module of
+	    '_' -> ets:fun2ms(fun({M,C}) when is_atom(M) -> C end);
+	    _ -> ets:fun2ms(fun({M,C}) when M=:=Module -> C end)
+	end,
+    AllClauses = lists:flatten(ets:select(?COVER_TABLE,MS)),
+
+    %% Sending clause by clause in order to avoid large lists
+    lists:foreach(
+      fun({M,F,A,C,_L}) ->
+	      Pattern = 
+		  {#bump{module=M, function=F, arity=A, clause=C}, '_'},
+	      Bumps = ets:match_object(?COVER_TABLE, Pattern),
+	      %% Reset
+	      lists:foreach(fun({Bump,_N}) ->
+				    ets:insert(?COVER_TABLE, {Bump,0})
+			    end,
+			    Bumps),
+	      CollectorPid ! {chunk,Bumps}
+      end,
+      AllClauses),
+    CollectorPid ! done,
+    remote_reply(From, ok).
 
 reload_originals([{Module,_File}|Compiled]) ->
     do_reload_original(Module),
@@ -938,7 +941,7 @@ get_data_for_remote_loading({Module,File}) ->
 %% Create a match spec which returns the clause info {Module,InitInfo} and 
 %% all #bump keys for the given module with 0 number of calls.
 ms(Module) ->
-    ets:fun2ms(fun({Mod,InitInfo})  -> 
+    ets:fun2ms(fun({Mod,InitInfo}) when Mod =:= Module -> 
 		       {Mod,InitInfo};
 		  ({Key,_}) when is_record(Key,bump),Key#bump.module=:=Module -> 
 		       {Key,0}
-- 
cgit v1.2.3


From a3971dd8d2379fafd76bdaebc3c8b1e71b4e411a Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Thu, 27 Jan 2011 12:09:17 +0100
Subject: Add process debug tags

---
 lib/tools/src/cover.erl | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'lib/tools')

diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index 48ab91db9c..f6f976e0af 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -114,6 +114,8 @@
             true -> ?BLOCK(Expr)
         end).
 
+-define(SPAWN_DBG(Tag,Value),put(Tag,Value)).
+
 -include_lib("stdlib/include/ms_transform.hrl").
 
 %%%----------------------------------------------------------------------
@@ -127,7 +129,10 @@ start() ->
     case whereis(?SERVER) of
 	undefined ->
 	    Starter = self(),
-	    Pid = spawn(fun() -> init_main(Starter) end),
+	    Pid = spawn(fun() -> 
+				?SPAWN_DBG(start,[]),
+				init_main(Starter) 
+			end),
 	    Ref = erlang:monitor(process,Pid),
 	    Return = 
 		receive 
@@ -596,6 +601,7 @@ main_process_loop(State) ->
 
 	{From, {export,OutFile,Module}} ->
 	    spawn(fun() ->
+			  ?SPAWN_DBG(export,{OutFile, Module}),
 			  do_export(Module, OutFile, From, State)
 		  end),
 	    main_process_loop(State);
@@ -667,6 +673,7 @@ main_process_loop(State) ->
 	    S = try 
 		    Loaded = is_loaded(Module, State),
 		    spawn(fun() ->
+				  ?SPAWN_DBG(analyse,{Module,Analysis, Level}),
 				  do_parallel_analysis(
 				    Module, Analysis, Level, 
 				    Loaded, From, State)
@@ -682,6 +689,8 @@ main_process_loop(State) ->
 	    S = try 
 		    Loaded = is_loaded(Module, State),
 		    spawn(fun() ->
+				  ?SPAWN_DBG(analyse_to_file,
+					     {Module,OutFile, Opts}),
 				  do_parallel_analysis_to_file(
 				    Module, OutFile, Opts, 
 				    Loaded, From, State)
@@ -777,6 +786,8 @@ remote_process_loop(State) ->
 
 	{remote,collect,Module,CollectorPid,From} ->
 	   spawn(fun() ->
+			 ?SPAWN_DBG(remote_collect, 
+				    {Module, CollectorPid, From}),
 			 do_collect(Module, CollectorPid, From)
 		 end),
 	    remote_process_loop(State);
@@ -894,7 +905,10 @@ remote_start(MainNode) ->
     case whereis(?SERVER) of
 	undefined ->
 	    Starter = self(),
-	    Pid = spawn(fun() -> init_remote(Starter,MainNode) end),
+	    Pid = spawn(fun() -> 
+				?SPAWN_DBG(remote_start,{MainNode}),
+				init_remote(Starter,MainNode) 
+			end),
 	    Ref = erlang:monitor(process,Pid),
 	    Return = 
 		receive 
@@ -968,6 +982,8 @@ remote_collect(Module,Nodes,Stop) ->
     Pids = lists:map(
 	     fun(Node) -> 
 		     spawn(fun() -> 
+				   ?SPAWN_DBG(remote_collect, 
+					      {Module, Nodes, Stop}),
 				   do_collection(Node, Module, Stop)
 			   end)
 	     end,
@@ -990,6 +1006,7 @@ do_collection(Node, Module, Stop) ->
 %% Process which receives chunks of data from remote nodes - either when
 %% analysing or when stopping cover on the remote nodes.
 collector_proc() ->
+    ?SPAWN_DBG(collector_proc, []),
     receive 
 	{chunk,Chunk} ->
 	    insert_in_collection_table(Chunk),
-- 
cgit v1.2.3


From 877935818cc41f74626f9a304acf3ec493ae8542 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Tue, 1 Feb 2011 19:21:35 +0100
Subject: Split the cover ets tables into two tables, one with the clause info
 and one with the bump info. This will make it faster to search the tables
 when analyzing and exporting data.

Also made cover export more parallel in how data is collected from the different nodes and also how data is read from ets. This should make the performance of cover much better on machines with multiple CPUs.
---
 lib/tools/src/cover.erl        | 125 ++++++++++++++++++++++-------------------
 lib/tools/test/cover_SUITE.erl |  13 ++++-
 2 files changed, 77 insertions(+), 61 deletions(-)

(limited to 'lib/tools')

diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index f6f976e0af..a2e8288227 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -100,8 +100,10 @@
 	      }).
 
 -define(COVER_TABLE, 'cover_internal_data_table').
+-define(COVER_CLAUSE_TABLE, 'cover_internal_clause_table').
 -define(BINARY_TABLE, 'cover_binary_code_table').
 -define(COLLECTION_TABLE, 'cover_collected_remote_data_table').
+-define(COLLECTION_CLAUSE_TABLE, 'cover_collected_remote_clause_table').
 -define(TAG, cover_compiled).
 -define(SERVER, cover_server).
 
@@ -517,8 +519,10 @@ remote_reply(MainNode,Reply) ->
 init_main(Starter) ->
     register(?SERVER,self()),
     ets:new(?COVER_TABLE, [set, public, named_table]),
+    ets:new(?COVER_CLAUSE_TABLE, [set, public, named_table]),
     ets:new(?BINARY_TABLE, [set, named_table]),
     ets:new(?COLLECTION_TABLE, [set, public, named_table]),
+    ets:new(?COLLECTION_CLAUSE_TABLE, [set, public, named_table]),
     process_flag(trap_exit,true),
     Starter ! {?SERVER,started},
     main_process_loop(#main_state{}).
@@ -757,6 +761,7 @@ main_process_loop(State) ->
 init_remote(Starter,MainNode) ->
     register(?SERVER,self()),
     ets:new(?COVER_TABLE, [set, public, named_table]),
+    ets:new(?COVER_CLAUSE_TABLE, [set, public, named_table]),
     Starter ! {self(),started},
     remote_process_loop(#remote_state{main_node=MainNode}).
 
@@ -819,27 +824,27 @@ remote_process_loop(State) ->
     end.
 
 do_collect(Module, CollectorPid, From) ->
-    MS = 
+    AllClauses = 
 	case Module of
-	    '_' -> ets:fun2ms(fun({M,C}) when is_atom(M) -> C end);
-	    _ -> ets:fun2ms(fun({M,C}) when M=:=Module -> C end)
+	    '_' -> ets:tab2list(?COVER_CLAUSE_TABLE);
+	    _ -> ets:lookup(?COVER_CLAUSE_TABLE, Module)
 	end,
-    AllClauses = lists:flatten(ets:select(?COVER_TABLE,MS)),
 
     %% Sending clause by clause in order to avoid large lists
-    lists:foreach(
-      fun({M,F,A,C,_L}) ->
-	      Pattern = 
-		  {#bump{module=M, function=F, arity=A, clause=C}, '_'},
-	      Bumps = ets:match_object(?COVER_TABLE, Pattern),
-	      %% Reset
-	      lists:foreach(fun({Bump,_N}) ->
-				    ets:insert(?COVER_TABLE, {Bump,0})
-			    end,
-			    Bumps),
-	      CollectorPid ! {chunk,Bumps}
-      end,
-      AllClauses),
+    pmap(
+      fun({_Mod,Clauses}) ->
+	      pmap(fun({M,F,A,C,_L}) ->
+			   Pattern = 
+			       {#bump{module=M, function=F, arity=A, clause=C}, '_'},
+			   Bumps = ets:match_object(?COVER_TABLE, Pattern),
+			   %% Reset
+			   lists:foreach(fun({Bump,_N}) ->
+						 ets:insert(?COVER_TABLE, {Bump,0})
+					 end,
+					 Bumps),
+			   CollectorPid ! {chunk,Bumps}
+		   end,Clauses)
+      end,AllClauses),
     CollectorPid ! done,
     remote_reply(From, ok).
 
@@ -880,6 +885,9 @@ load_compiled([{Module,File,Binary,InitialTable}|Compiled],Acc) ->
 load_compiled([],Acc) ->
     Acc.
 
+insert_initial_data([Item|Items]) when is_atom(element(1,Item)) ->
+    ets:insert(?COVER_CLAUSE_TABLE, Item),
+    insert_initial_data(Items);
 insert_initial_data([Item|Items]) ->
     ets:insert(?COVER_TABLE, Item),
     insert_initial_data(Items);
@@ -949,15 +957,15 @@ remote_load_compiled(Nodes, [MF | Rest], Acc, ModNum) ->
 get_data_for_remote_loading({Module,File}) ->
     [{Module,Binary}] = ets:lookup(?BINARY_TABLE,Module),
     %%! The InitialTable list will be long if the module is big - what to do??
-    InitialTable = ets:select(?COVER_TABLE,ms(Module)),
-    {Module,File,Binary,InitialTable}.
+    InitialBumps = ets:select(?COVER_TABLE,ms(Module)),
+    InitialClauses = ets:lookup(?COVER_CLAUSE_TABLE,Module),
+
+    {Module,File,Binary,InitialBumps ++ InitialClauses}.
 
 %% Create a match spec which returns the clause info {Module,InitInfo} and 
 %% all #bump keys for the given module with 0 number of calls.
 ms(Module) ->
-    ets:fun2ms(fun({Mod,InitInfo}) when Mod =:= Module -> 
-		       {Mod,InitInfo};
-		  ({Key,_}) when is_record(Key,bump),Key#bump.module=:=Module -> 
+    ets:fun2ms(fun({Key,_}) when Key#bump.module=:=Module -> 
 		       {Key,0}
 	       end).
 
@@ -979,22 +987,12 @@ remote_reset(Module,Nodes) ->
 
 %% Collect data from remote nodes - used for analyse or stop(Node)
 remote_collect(Module,Nodes,Stop) ->
-    Pids = lists:map(
-	     fun(Node) -> 
-		     spawn(fun() -> 
-				   ?SPAWN_DBG(remote_collect, 
-					      {Module, Nodes, Stop}),
-				   do_collection(Node, Module, Stop)
-			   end)
-	     end,
-	     Nodes),
-    RefsNPids = [{erlang:monitor(process, Pid),Pid} || Pid <- Pids],
-    lists:foreach(fun({Ref,Pid}) ->
-			  receive
-			      {'DOWN', Ref, process, Pid, _} ->
-				  ok
-			  end
-		  end,RefsNPids).
+    pmap(fun(Node) -> 
+		 ?SPAWN_DBG(remote_collect, 
+			    {Module, Nodes, Stop}),
+		 do_collection(Node, Module, Stop)
+	 end,
+	 Nodes).
 
 do_collection(Node, Module, Stop) ->
     CollectorPid = spawn(fun collector_proc/0),
@@ -1241,7 +1239,7 @@ do_compile_beam(Module,Beam) ->
 		    
 		    %% Store info about all function clauses in database
 		    InitInfo = reverse(Vars#vars.init_info),
-		    ets:insert(?COVER_TABLE, {Module, InitInfo}),
+		    ets:insert(?COVER_CLAUSE_TABLE, {Module, InitInfo}),
 		    
 		    %% Store binary code so it can be loaded on remote nodes
 		    ets:insert(?BINARY_TABLE, {Module, Binary}),
@@ -1775,9 +1773,8 @@ common_elems(L1, L2) ->
 %% Collect data for all modules
 collect(Nodes) ->
     %% local node
-    MS = ets:fun2ms(fun({M,C}) when is_atom(M) -> {M,C} end),
-    AllClauses = ets:select(?COVER_TABLE,MS),
-    move_modules(AllClauses),
+    AllClauses = ets:tab2list(?COVER_CLAUSE_TABLE),
+    pmap(fun move_modules/1,AllClauses),
     
     %% remote nodes
     remote_collect('_',Nodes,false).
@@ -1785,7 +1782,7 @@ collect(Nodes) ->
 %% Collect data for one module
 collect(Module,Clauses,Nodes) ->
     %% local node
-    move_modules([{Module,Clauses}]),
+    move_modules({Module,Clauses}),
     
     %% remote nodes
     remote_collect(Module,Nodes,false).
@@ -1793,12 +1790,9 @@ collect(Module,Clauses,Nodes) ->
 
 %% When analysing, the data from the local ?COVER_TABLE is moved to the
 %% ?COLLECTION_TABLE. Resetting data in ?COVER_TABLE
-move_modules([{Module,Clauses}|AllClauses]) ->
-    ets:insert(?COLLECTION_TABLE,{Module,Clauses}),
-    move_clauses(Clauses),
-    move_modules(AllClauses);
-move_modules([]) ->
-    ok.
+move_modules({Module,Clauses}) ->
+    ets:insert(?COLLECTION_CLAUSE_TABLE,{Module,Clauses}),
+    move_clauses(Clauses).
     
 move_clauses([{M,F,A,C,_L}|Clauses]) ->
     Pattern = {#bump{module=M, function=F, arity=A, clause=C}, '_'},
@@ -1842,12 +1836,12 @@ do_parallel_analysis(Module, Analysis, Level, Loaded, From, State) ->
     C = case Loaded of
 	    {loaded, _File} ->
 		[{Module,Clauses}] = 
-		    ets:lookup(?COVER_TABLE,Module),
+		    ets:lookup(?COVER_CLAUSE_TABLE,Module),
 		collect(Module,Clauses,State#main_state.nodes),
 		Clauses;
 	    _ ->
 		[{Module,Clauses}] = 
-		    ets:lookup(?COLLECTION_TABLE,Module),
+		    ets:lookup(?COLLECTION_CLAUSE_TABLE,Module),
 		Clauses
 	end,
     R = do_analyse(Module, Analysis, Level, C),
@@ -1933,7 +1927,7 @@ do_parallel_analysis_to_file(Module, OutFile, Opts, Loaded, From, State) ->
     File = case Loaded of
 	       {loaded, File0} ->
 		   [{Module,Clauses}] = 
-		       ets:lookup(?COVER_TABLE,Module),
+		       ets:lookup(?COVER_CLAUSE_TABLE,Module),
 		   collect(Module, Clauses,
 			   State#main_state.nodes),
 		   File0;
@@ -2063,7 +2057,7 @@ do_export(Module, OutFile, From, State) ->
 			try is_loaded(Module, State) of
 			    {loaded, File} ->
 				[{Module,Clauses}] = 
-				    ets:lookup(?COVER_TABLE,Module),
+				    ets:lookup(?COVER_CLAUSE_TABLE,Module),
 				collect(Module, Clauses,
 					State#main_state.nodes),
 				do_export_table([{Module,File}],[],Fd);
@@ -2099,7 +2093,7 @@ merge([],ModuleList) ->
 
 write_module_data([{Module,File}|ModList],Fd) ->
     write({file,Module,File},Fd),
-    [Clauses] = ets:lookup(?COLLECTION_TABLE,Module),
+    [Clauses] = ets:lookup(?COLLECTION_CLAUSE_TABLE,Module),
     write(Clauses,Fd),
     ModuleData = ets:match_object(?COLLECTION_TABLE,{#bump{module=Module},'_'}),
     do_write_module_data(ModuleData,Fd),
@@ -2149,7 +2143,7 @@ do_import_to_table(Fd,ImportFile,Imported,DontImport) ->
 	{Module,Clauses} ->
 	    case lists:member(Module,DontImport) of
 		false ->
-		    ets:insert(?COLLECTION_TABLE,{Module,Clauses});
+		    ets:insert(?COLLECTION_CLAUSE_TABLE,{Module,Clauses});
 		true ->
 			    ok
 	    end,
@@ -2183,14 +2177,14 @@ do_reset_main_node(Module,Nodes) ->
     remote_reset(Module,Nodes).
 
 do_reset_collection_table(Module) ->
-    ets:delete(?COLLECTION_TABLE,Module),
+    ets:delete(?COLLECTION_CLAUSE_TABLE,Module),
     ets:match_delete(?COLLECTION_TABLE, {#bump{module=Module},'_'}).
 
 %% do_reset(Module) -> ok
 %% The reset is done on a per-clause basis to avoid building
 %% long lists in the case of very large modules
 do_reset(Module) ->
-    [{Module,Clauses}] = ets:lookup(?COVER_TABLE, Module),
+    [{Module,Clauses}] = ets:lookup(?COVER_CLAUSE_TABLE, Module),
     do_reset2(Clauses).
 
 do_reset2([{M,F,A,C,_L}|Clauses]) ->
@@ -2205,7 +2199,7 @@ do_reset2([]) ->
     ok.    
 
 do_clear(Module) ->
-    ets:match_delete(?COVER_TABLE, {Module,'_'}),
+    ets:match_delete(?COVER_CLAUSE_TABLE, {Module,'_'}),
     ets:match_delete(?COVER_TABLE, {#bump{module=Module},'_'}),
     ets:match_delete(?COLLECTION_TABLE, {#bump{module=Module},'_'}).
 
@@ -2245,3 +2239,18 @@ escape_lt_and_gt1([],Acc) ->
     lists:reverse(Acc);
 escape_lt_and_gt1([H|T],Acc) ->
     escape_lt_and_gt1(T,[H|Acc]).
+
+pmap(Fun,List) ->
+    Collector = self(),
+    Pids = lists:map(fun(E) ->
+			     spawn_link(fun() ->
+						?SPAWN_DBG(pmap,E),
+						Collector ! {res,self(),Fun(E)} 
+					end) 
+		     end, List),
+    lists:map(fun(Pid) ->
+		      receive
+			  {res,Pid,Res} ->
+			      Res
+		      end
+	      end, Pids).
diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index b9ccd62d0b..4beb433839 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(cover_SUITE).
 
--export([all/1]).
+-export([all/1, init_per_testcase/2, end_per_testcase/2]).
 -export([start/1, compile/1, analyse/1, misc/1, stop/1, 
 	 distribution/1, export_import/1,
 	 otp_5031/1, eif/1, otp_5305/1, otp_5418/1, otp_6115/1, otp_7095/1,
@@ -49,6 +49,13 @@ all(suite) ->
 	          "Can't run cover test."}
     end.
 
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+end_per_testcase(_TestCase, _Config) ->
+    %cover:stop(),
+    ok.
+
 start(suite) -> [];
 start(Config) when is_list(Config) ->
     ?line ok = file:set_cwd(?config(data_dir, Config)),
@@ -381,8 +388,8 @@ export_import(Config) when is_list(Config) ->
     ?line {ok,a} = cover:compile(a),
     ?line ?t:capture_start(),
     ?line ok = cover:export("all_exported"),
-    ?line [Text2] = ?t:capture_get(),
-    ?line "Export includes data from imported files"++_ = lists:flatten(Text2),
+    ?line [] = ?t:capture_get(),
+%    ?line "Export includes data from imported files"++_ = lists:flatten(Text2),
     ?line ?t:capture_stop(),
     ?line ok = cover:stop(),
     ?line ok = cover:import("all_exported"),
-- 
cgit v1.2.3


From e24ae469ca5c2814dfd133da1e6882b84a7db95b Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Wed, 2 Feb 2011 10:52:54 +0100
Subject: Add aync_analyse_to_file function to cover

---
 lib/tools/src/cover.erl | 56 +++++++++++++++++++++++++++++++++++++------------
 1 file changed, 43 insertions(+), 13 deletions(-)

(limited to 'lib/tools')

diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index a2e8288227..50a812aa09 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -61,6 +61,9 @@
 	 analyse/1, analyse/2, analyse/3, analyze/1, analyze/2, analyze/3,
 	 analyse_to_file/1, analyse_to_file/2, analyse_to_file/3,
 	 analyze_to_file/1, analyze_to_file/2, analyze_to_file/3,
+	 async_analyse_to_file/1,async_analyse_to_file/2,
+	 async_analyse_to_file/3, async_analyze_to_file/1,
+	 async_analyze_to_file/2, async_analyze_to_file/3,
 	 export/1, export/2, import/1,
 	 modules/0, imported/0, imported_modules/0, which_nodes/0, is_compiled/1,
 	 reset/1, reset/0,
@@ -389,6 +392,30 @@ analyze_to_file(Module, OptOrOut) -> analyse_to_file(Module, OptOrOut).
 analyze_to_file(Module, OutFile, Options) -> 
     analyse_to_file(Module, OutFile, Options).
 
+async_analyse_to_file(Module) ->
+    do_spawn(?MODULE,analyse_to_file, [Module]).
+async_analyse_to_file(Module, OutFileOrOpts) ->
+    do_spawn(?MODULE, analyse_to_file, [Module, OutFileOrOpts]).
+async_analyse_to_file(Module, OutFile, Options) ->
+    do_spawn(?MODULE, analyse_to_file, [Module, OutFile, Options]).
+
+do_spawn(M,F,A) ->
+    spawn(fun() ->
+		  case apply(M,F,A) of
+		      {ok, _} ->
+			  ok;
+		      {error, Reason} ->
+			  exit(Reason)
+		  end
+	  end).
+
+async_analyze_to_file(Module) ->
+    async_analyse_to_file(Module).
+async_analyze_to_file(Module, OutFileOrOpts) ->
+    async_analyse_to_file(Module, OutFileOrOpts).
+async_analyze_to_file(Module, OutFile, Options) ->
+    async_analyse_to_file(Module, OutFile, Options).
+
 outfilename(Module,Opts) ->
     case lists:member(html,Opts) of
 	true ->
@@ -824,7 +851,7 @@ remote_process_loop(State) ->
     end.
 
 do_collect(Module, CollectorPid, From) ->
-    AllClauses = 
+    AllMods = 
 	case Module of
 	    '_' -> ets:tab2list(?COVER_CLAUSE_TABLE);
 	    _ -> ets:lookup(?COVER_CLAUSE_TABLE, Module)
@@ -833,21 +860,24 @@ do_collect(Module, CollectorPid, From) ->
     %% Sending clause by clause in order to avoid large lists
     pmap(
       fun({_Mod,Clauses}) ->
-	      pmap(fun({M,F,A,C,_L}) ->
-			   Pattern = 
-			       {#bump{module=M, function=F, arity=A, clause=C}, '_'},
-			   Bumps = ets:match_object(?COVER_TABLE, Pattern),
-			   %% Reset
-			   lists:foreach(fun({Bump,_N}) ->
-						 ets:insert(?COVER_TABLE, {Bump,0})
-					 end,
-					 Bumps),
-			   CollectorPid ! {chunk,Bumps}
-		   end,Clauses)
-      end,AllClauses),
+	      lists:map(fun(Clause) ->
+				send_collected_data(Clause, CollectorPid)
+			end,Clauses)
+      end,AllMods),
     CollectorPid ! done,
     remote_reply(From, ok).
 
+send_collected_data({M,F,A,C,_L}, CollectorPid) ->
+    Pattern = 
+	{#bump{module=M, function=F, arity=A, clause=C}, '_'},
+    Bumps = ets:match_object(?COVER_TABLE, Pattern),
+    %% Reset
+    lists:foreach(fun({Bump,_N}) ->
+			  ets:insert(?COVER_TABLE, {Bump,0})
+		  end,
+		  Bumps),
+    CollectorPid ! {chunk,Bumps}.
+
 reload_originals([{Module,_File}|Compiled]) ->
     do_reload_original(Module),
     reload_originals(Compiled);
-- 
cgit v1.2.3


From cb119ebc0e923b6b85a8352ef71012eb431b54d5 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Wed, 2 Feb 2011 10:52:42 +0100
Subject: Update documentation to reflect performance enhancement changes of
 cover

---
 lib/tools/doc/src/cover.xml         | 29 +++++++++++++++++++++++++++++
 lib/tools/doc/src/cover_chapter.xml |  7 +++++++
 lib/tools/src/cover.erl             | 34 ++++++++++++++++++++++++----------
 3 files changed, 60 insertions(+), 10 deletions(-)

(limited to 'lib/tools')

diff --git a/lib/tools/doc/src/cover.xml b/lib/tools/doc/src/cover.xml
index 323bd0dda8..0a3302bda5 100644
--- a/lib/tools/doc/src/cover.xml
+++ b/lib/tools/doc/src/cover.xml
@@ -270,6 +270,8 @@
           defaults to <c>function</c>.</p>
         <p>If <c>Module</c> is not Cover compiled, the function returns
           <c>{error,{not_cover_compiled,Module}}</c>.</p>
+	<p>HINT: It is possible to issue multiple analyse_to_file commands at
+	  the same time. </p>
       </desc>
     </func>
     <func>
@@ -307,6 +309,33 @@
           <c>.beam</c> file, or in <c>../src</c> relative to that
           directory. If no source code is found, 
           <c>,{error,no_source_code_found}</c> is returned.</p>
+	<p>HINT: It is possible to issue multiple analyse_to_file commands at
+	  the same time. </p> 
+      </desc>
+    </func>
+    <func>
+      <name>async_analyse_to_file(Module) -> </name>
+      <name>async_analyse_to_file(Module,Options) -> </name>
+      <name>async_analyse_to_file(Module, OutFile) -> </name>
+      <name>async_analyse_to_file(Module, OutFile, Options) ->  pid()</name>
+      <fsummary>Asynchronous call to analyse_to_file.</fsummary>
+      <type>
+        <v>Module = atom()</v>
+        <v>OutFile = string()</v>
+        <v>Options = [Option]</v>
+        <v>Option = html</v>
+        <v>Error = {not_cover_compiled,Module} | {file,File,Reason} | no_source_code_found | not_main_node</v>
+        <v>&nbsp;File = string()</v>
+        <v>&nbsp;Reason = term()</v>
+      </type>
+      <desc>
+	<p>This function works exactly the same way as 
+	<seealso marker="#analyse_to_file-1">analyse_to_file</seealso> except
+	that it is asynchronous instead of synchronous. The spawned process
+	will link with the caller when created. If an <c>Error</c> occurs
+	while doing the cover analysis the process will crash with the same
+	error reason as <seealso marker="#analyse_to_file-1">analyse_to_file</seealso> 
+	would return.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/tools/doc/src/cover_chapter.xml b/lib/tools/doc/src/cover_chapter.xml
index b4f7919183..92a790c34e 100644
--- a/lib/tools/doc/src/cover_chapter.xml
+++ b/lib/tools/doc/src/cover_chapter.xml
@@ -403,6 +403,13 @@ ok
         database contains information about each executable line in each
         Cover compiled module, performance decreases proportionally to
         the size and number of the Cover compiled modules.</p>
+      <p>To improve performance when analysing cover results it is possible
+	to do multiple calls to <seealso marker="cover#analyse-1">analyse</seealso>
+	and <seealso marker="cover#analyse_to_file-1">analyse_to_file</seealso>
+	at once. You can also use the 
+	<seealso marker="cover#async_analyse_to_file-1">async_analyse_to_file</seealso> 
+	convenience function.
+      </p>
     </section>
 
     <section>
diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index 50a812aa09..cc4f75f2e8 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -35,23 +35,37 @@
 %% remote_process_loop/1.
 %%
 %% TABLES
-%% Each nodes has an ets table named 'cover_internal_data_table'
-%% (?COVER_TABLE).  This table contains the coverage data and is
-%% continously updated when cover compiled code is executed.
+%% Each nodes has two tables: cover_internal_data_table (?COVER_TABLE) and.
+%% cover_internal_clause_table (?COVER_CLAUSE_TABLE). 
+%% ?COVER_TABLE contains the bump data i.e. the data about which lines
+%% have been executed how many times.
+%% ?COVER_CLAUSE_TABLE contains information about which clauses in which modules
+%% cover is currently collecting statistics.
 %% 
-%% The main node owns a table named
-%% 'cover_collected_remote_data_table' (?COLLECTION_TABLE). This table
-%% contains data which is collected from remote nodes (either when a
-%% remote node is stopped with cover:stop/1 or when analysing. When
-%% analysing, data is even moved from the ?COVER_TABLE on the main
-%% node to the ?COLLECTION_TABLE.
+%% The main node owns tables named
+%% 'cover_collected_remote_data_table' (?COLLECTION_TABLE) and
+%% 'cover_collected_remote_clause_table' (?COLLECTION_CLAUSE_TABLE). 
+%% These tables contain data which is collected from remote nodes (either when a
+%% remote node is stopped with cover:stop/1 or when analysing). When
+%% analysing, data is even moved from the COVER tables on the main
+%% node to the COLLECTION tables.
 %%
 %% The main node also has a table named 'cover_binary_code_table'
 %% (?BINARY_TABLE). This table contains the binary code for each cover
 %% compiled module. This is necessary so that the code can be loaded
 %% on remote nodes that are started after the compilation.
 %%
-
+%% PARELLALISM
+%% To take advantage of SMP when doing the cover analysis both the data 
+%% collection and analysis has been parallelized. One process is spawned for
+%% each node when collecting data, and on the remote node when collecting data
+%% one process is spawned per module. 
+%% 
+%% When analyzing data it is possible to issue multiple analyse(_to_file)/X 
+%% calls at once. They are however all calls (for backwardscompatability 
+%% reasons) so the user of cover will have to spawn several processes to to the
+%% calls ( or use async_analyse_to_file ). 
+%%
 
 %% External exports
 -export([start/0, start/1,
-- 
cgit v1.2.3


From d45434a0b0388e4598186e60fa3d94db5678de4f Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Wed, 2 Feb 2011 15:42:07 +0100
Subject: Update internal pmap to have a process limit Add write concurrancy to
 cover masters ?COVER_TABLE

---
 lib/tools/src/cover.erl | 53 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 17 deletions(-)

(limited to 'lib/tools')

diff --git a/lib/tools/src/cover.erl b/lib/tools/src/cover.erl
index cc4f75f2e8..ada2db45be 100644
--- a/lib/tools/src/cover.erl
+++ b/lib/tools/src/cover.erl
@@ -407,14 +407,14 @@ analyze_to_file(Module, OutFile, Options) ->
     analyse_to_file(Module, OutFile, Options).
 
 async_analyse_to_file(Module) ->
-    do_spawn(?MODULE,analyse_to_file, [Module]).
+    do_spawn(?MODULE, analyse_to_file, [Module]).
 async_analyse_to_file(Module, OutFileOrOpts) ->
     do_spawn(?MODULE, analyse_to_file, [Module, OutFileOrOpts]).
 async_analyse_to_file(Module, OutFile, Options) ->
     do_spawn(?MODULE, analyse_to_file, [Module, OutFile, Options]).
 
 do_spawn(M,F,A) ->
-    spawn(fun() ->
+    spawn_link(fun() ->
 		  case apply(M,F,A) of
 		      {ok, _} ->
 			  ok;
@@ -559,7 +559,11 @@ remote_reply(MainNode,Reply) ->
 
 init_main(Starter) ->
     register(?SERVER,self()),
-    ets:new(?COVER_TABLE, [set, public, named_table]),
+    %% Having write concurrancy here gives a 40% performance boost
+    %% when collect/1 is called. 
+    ets:new(?COVER_TABLE, [set, public, named_table
+			   ,{write_concurrency, true}
+			  ]),
     ets:new(?COVER_CLAUSE_TABLE, [set, public, named_table]),
     ets:new(?BINARY_TABLE, [set, named_table]),
     ets:new(?COLLECTION_TABLE, [set, public, named_table]),
@@ -801,7 +805,10 @@ main_process_loop(State) ->
 
 init_remote(Starter,MainNode) ->
     register(?SERVER,self()),
-    ets:new(?COVER_TABLE, [set, public, named_table]),
+    ets:new(?COVER_TABLE, [set, public, named_table
+			   %% write_concurrency here makes otp_8270 break :(
+			   %,{write_concurrency, true}
+			  ]),
     ets:new(?COVER_CLAUSE_TABLE, [set, public, named_table]),
     Starter ! {self(),started},
     remote_process_loop(#remote_state{main_node=MainNode}).
@@ -2284,17 +2291,29 @@ escape_lt_and_gt1([],Acc) ->
 escape_lt_and_gt1([H|T],Acc) ->
     escape_lt_and_gt1(T,[H|Acc]).
 
-pmap(Fun,List) ->
+pmap(Fun, List) ->
+    pmap(Fun, List, 20).
+pmap(Fun, List, Limit) ->
+    pmap(Fun, List, [], Limit, 0, []).
+pmap(Fun, [E | Rest], Pids, Limit, Cnt, Acc) when Cnt < Limit ->
     Collector = self(),
-    Pids = lists:map(fun(E) ->
-			     spawn_link(fun() ->
-						?SPAWN_DBG(pmap,E),
-						Collector ! {res,self(),Fun(E)} 
-					end) 
-		     end, List),
-    lists:map(fun(Pid) ->
-		      receive
-			  {res,Pid,Res} ->
-			      Res
-		      end
-	      end, Pids).
+    Pid = spawn_link(fun() ->
+			     ?SPAWN_DBG(pmap,E),
+			     Collector ! {res,self(),Fun(E)} 
+		     end),
+    erlang:monitor(process, Pid),
+    pmap(Fun, Rest, Pids ++ [Pid], Limit, Cnt + 1, Acc);
+pmap(Fun, List, [Pid | Pids], Limit, Cnt, Acc) ->
+    receive
+	{'DOWN', _Ref, process, _, _} ->
+	    pmap(Fun, List, [Pid | Pids], Limit, Cnt - 1, Acc);
+	{res, Pid, Res} ->
+	    pmap(Fun, List, Pids, Limit, Cnt, [Res | Acc])
+    end;
+pmap(_Fun, [], [], _Limit, 0, Acc) ->
+    lists:reverse(Acc);
+pmap(Fun, [], [], Limit, Cnt, Acc) ->
+    receive
+	{'DOWN', _Ref, process, _, _} ->
+	    pmap(Fun, [], [], Limit, Cnt - 1, Acc)
+    end.
-- 
cgit v1.2.3


From 1b4303f812d5968fc6de961146b39a1b20f75e42 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Thu, 17 Feb 2011 11:09:55 +0100
Subject: Update testcases which need crypto to be skipped on platforms which
 does not have crypto

---
 lib/tools/test/cover_SUITE.erl | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'lib/tools')

diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index 4beb433839..f632409208 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -49,6 +49,13 @@ all(suite) ->
 	          "Can't run cover test."}
     end.
 
+init_per_testcase(TC, Config) when TC =:= misc; TC =:= compile ->
+    case code:which(crypto) of
+	Path when is_list(Path) ->
+	    init_per_testcase(dummy_tc, Config);
+	_Else ->
+	    {skip, "No crypto file to test with"}
+    end;
 init_per_testcase(_TestCase, Config) ->
     Config.
 
-- 
cgit v1.2.3


From 2cbb5d191fd8f94c113cbf61c243999388f65c3b Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Tue, 5 Oct 2010 17:58:16 +0200
Subject: Update all fin_per_testcase to end_per_testcase.

---
 lib/tools/test/cover_SUITE.erl      |   2 +-
 lib/tools/test/cprof_SUITE.erl      |   4 +-
 lib/tools/test/emem_SUITE.erl       |   4 +-
 lib/tools/test/ignore_cores.erl     | 159 +++++++++++++++++++++++++++++++++++-
 lib/tools/test/instrument_SUITE.erl |   4 +-
 lib/tools/test/tools_SUITE.erl      |   4 +-
 lib/tools/test/xref_SUITE.erl       |   4 +-
 7 files changed, 169 insertions(+), 12 deletions(-)
 mode change 120000 => 100644 lib/tools/test/ignore_cores.erl

(limited to 'lib/tools')

diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index b9ccd62d0b..7169412bcd 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-2010. All Rights Reserved.
 %% 
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
diff --git a/lib/tools/test/cprof_SUITE.erl b/lib/tools/test/cprof_SUITE.erl
index e697cc1571..f366ac75bc 100644
--- a/lib/tools/test/cprof_SUITE.erl
+++ b/lib/tools/test/cprof_SUITE.erl
@@ -63,14 +63,14 @@ config(data_dir, _) ->
     "cprof_SUITE_data".
 -else.
 %% When run in test server.
--export([all/1, init_per_testcase/2, fin_per_testcase/2, not_run/1]).
+-export([all/1, init_per_testcase/2, end_per_testcase/2, not_run/1]).
 -export([basic/1, on_load/1, modules/1]).
 	 
 init_per_testcase(_Case, Config) ->
     ?line Dog=test_server:timetrap(test_server:seconds(30)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     erlang:trace_pattern({'_','_','_'}, false, [local,meta,call_count]),
     erlang:trace_pattern(on_load, false, [local,meta,call_count]),
     erlang:trace(all, false, [all]),
diff --git a/lib/tools/test/emem_SUITE.erl b/lib/tools/test/emem_SUITE.erl
index 430fa86c6c..1bc1c2dcee 100644
--- a/lib/tools/test/emem_SUITE.erl
+++ b/lib/tools/test/emem_SUITE.erl
@@ -24,7 +24,7 @@
 	 receive_and_save_trace/2, send_trace/2]).
 
 
--export([all/1, init_per_testcase/2, fin_per_testcase/2]).
+-export([all/1, init_per_testcase/2, end_per_testcase/2]).
 
 -export([live_node/1,
 	 'sparc_sunos5.8_32b_emt2.0'/1,
@@ -100,7 +100,7 @@ init_per_testcase(Case, Config) when is_list(Config) ->
 			       [{watchdog, Dog}, {testcase, Case} | Config])
     end.
 
-fin_per_testcase(_Case, Config) when is_list(Config) ->
+end_per_testcase(_Case, Config) when is_list(Config) ->
     ignore_cores:restore(Config),
     Dog = ?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
diff --git a/lib/tools/test/ignore_cores.erl b/lib/tools/test/ignore_cores.erl
deleted file mode 120000
index 8902a469ef..0000000000
--- a/lib/tools/test/ignore_cores.erl
+++ /dev/null
@@ -1 +0,0 @@
-../../../erts/test/ignore_cores.erl
\ No newline at end of file
diff --git a/lib/tools/test/ignore_cores.erl b/lib/tools/test/ignore_cores.erl
new file mode 100644
index 0000000000..8b1ac0fe6c
--- /dev/null
+++ b/lib/tools/test/ignore_cores.erl
@@ -0,0 +1,158 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%%
+%% The contents of this file are subject to the Erlang Public License,
+%% Version 1.1, (the "License"); you may not use this file except in
+%% compliance with the License. You should have received a copy of the
+%% Erlang Public License along with this software. If not, it can be
+%% retrieved online at http://www.erlang.org/.
+%%
+%% Software distributed under the License is distributed on an "AS IS"
+%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
+%% the License for the specific language governing rights and limitations
+%% under the License.
+%%
+%% %CopyrightEnd%
+%%
+
+%%%-------------------------------------------------------------------
+%%% File    : ignore_cores.erl
+%%% Author  : Rickard Green <rickard.s.green@ericsson.com>
+%%% Description : 
+%%%
+%%% Created : 11 Feb 2008 by Rickard Green <rickard.s.green@ericsson.com>
+%%%-------------------------------------------------------------------
+
+-module(ignore_cores).
+
+-include_lib("test_server/include/test_server.hrl").
+
+-export([init/1, fini/1, setup/3, setup/4, restore/1, dir/1]).
+
+-record(ignore_cores, {org_cwd,
+		       org_path,
+		       org_pwd_env,
+		       ign_dir = false,
+		       cores_dir = false}).
+
+%%
+%% Takes a testcase config
+%%
+
+init(Config) ->
+    {ok, OrgCWD} = file:get_cwd(),
+    [{ignore_cores,
+      #ignore_cores{org_cwd = OrgCWD,
+		    org_path = code:get_path(),
+		    org_pwd_env = os:getenv("PWD")}}
+     | lists:keydelete(ignore_cores, 1, Config)].
+    
+fini(Config) ->
+    #ignore_cores{org_cwd = OrgCWD,
+		  org_path = OrgPath,
+		  org_pwd_env = OrgPWD} = ?config(ignore_cores, Config),
+    ok = file:set_cwd(OrgCWD),
+    true = code:set_path(OrgPath),
+    case OrgPWD of
+	false -> ok;
+	_ -> true = os:putenv("PWD", OrgPWD)
+    end,
+    lists:keydelete(ignore_cores, 1, Config).
+
+setup(Suite, Testcase, Config) ->
+    setup(Suite, Testcase, Config, false).
+
+setup(Suite, Testcase, Config, SetCwd) when is_atom(Suite), 
+                                            is_atom(Testcase),
+                                            is_list(Config) ->
+    #ignore_cores{org_cwd = OrgCWD,
+		  org_path = OrgPath,
+		  org_pwd_env = OrgPWD} = ?config(ignore_cores, Config),
+    Path = lists:map(fun (".") -> OrgCWD; (Dir) -> Dir end, OrgPath),
+    true = code:set_path(Path),
+    PrivDir = ?config(priv_dir, Config),
+    IgnDir = filename:join([PrivDir,
+			 atom_to_list(Suite)
+			 ++ "_"
+			 ++ atom_to_list(Testcase)
+			 ++ "_wd"]),
+    ok = file:make_dir(IgnDir),
+    case SetCwd of
+	false ->
+	    ok;
+	_ ->
+	    ok = file:set_cwd(IgnDir),
+	    OrgPWD = case os:getenv("PWD") of
+			 false -> false;
+			 PWD ->
+			     os:putenv("PWD", IgnDir),
+			     PWD
+		     end
+    end,
+    ok = file:write_file(filename:join([IgnDir, "ignore_core_files"]), <<>>),
+    %% cores are dumped in /cores on MacOS X
+    CoresDir = case {?t:os_type(), filelib:is_dir("/cores")} of
+		   {{unix,darwin}, true} ->
+		       filelib:fold_files("/cores",
+					  "^core.*$",
+					  false,
+					  fun (C,Cs) -> [C|Cs] end,
+					  []);
+		   _ ->
+		       false
+	       end,
+    lists:keyreplace(ignore_cores,
+		     1,
+		     Config,
+		     {ignore_cores,
+		      #ignore_cores{org_cwd = OrgCWD,
+				    org_path = OrgPath,
+				    org_pwd_env = OrgPWD,
+				    ign_dir = IgnDir,
+				    cores_dir = CoresDir}}).
+
+restore(Config) ->
+    #ignore_cores{org_cwd = OrgCWD,
+		  org_path = OrgPath,
+		  org_pwd_env = OrgPWD,
+		  ign_dir = IgnDir,
+		  cores_dir = CoresDir} = ?config(ignore_cores, Config),
+    try
+	case CoresDir of
+	    false ->
+		ok;
+	    _ ->
+		%% Move cores dumped by these testcases in /cores
+		%% to cwd.
+		lists:foreach(fun (C) ->
+				      case lists:member(C, CoresDir) of
+					  true -> ok;
+					  _ ->
+					      Dst = filename:join(
+						      [IgnDir,
+						       filename:basename(C)]),
+					      {ok, _} = file:copy(C, Dst),
+					      file:delete(C)
+				      end
+			      end,
+			      filelib:fold_files("/cores",
+						 "^core.*$",
+						 false,
+						 fun (C,Cs) -> [C|Cs] end,
+						 []))
+	end
+    after
+	catch file:set_cwd(OrgCWD),
+	catch code:set_path(OrgPath),
+	case OrgPWD of
+	    false -> ok;
+	    _ -> catch os:putenv("PWD", OrgPWD)
+	end
+    end.
+
+
+dir(Config) ->
+    #ignore_cores{ign_dir = Dir} = ?config(ignore_cores, Config),
+    Dir.
diff --git a/lib/tools/test/instrument_SUITE.erl b/lib/tools/test/instrument_SUITE.erl
index da5930e015..6a0d1965fe 100644
--- a/lib/tools/test/instrument_SUITE.erl
+++ b/lib/tools/test/instrument_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(instrument_SUITE).
 
--export([all/1,init_per_testcase/2,fin_per_testcase/2]).
+-export([all/1,init_per_testcase/2,end_per_testcase/2]).
 
 -export(['+Mim true'/1, '+Mis true'/1]).
 
@@ -28,7 +28,7 @@ init_per_testcase(_Case, Config) ->
     ?line Dog=?t:timetrap(10000),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     ?t:timetrap_cancel(Dog),
     ok.
diff --git a/lib/tools/test/tools_SUITE.erl b/lib/tools/test/tools_SUITE.erl
index 6b952f10ab..642703cc1b 100644
--- a/lib/tools/test/tools_SUITE.erl
+++ b/lib/tools/test/tools_SUITE.erl
@@ -26,7 +26,7 @@
 
 %% Test server specific exports
 -export([all/1]).
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Test cases must be exported.
 -export([app_test/1]).
@@ -39,7 +39,7 @@ all(suite) ->
 init_per_testcase(_Case, Config) ->
     ?line Dog=test_server:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
-fin_per_testcase(_Case, Config) ->
+end_per_testcase(_Case, Config) ->
     Dog=?config(watchdog, Config),
     test_server:timetrap_cancel(Dog),
     ok.
diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl
index f9d062ef85..e10448862e 100644
--- a/lib/tools/test/xref_SUITE.erl
+++ b/lib/tools/test/xref_SUITE.erl
@@ -59,7 +59,7 @@
 	range/1, relation_to_family/1, set/1, to_external/1,
 	union/2]).
 
--export([init_per_testcase/2, fin_per_testcase/2]).
+-export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Checks some info counters of a server and some relations that should hold.
 -export([check_count/1, check_state/1]).
@@ -91,7 +91,7 @@ init_per_testcase(_Case, Config) ->
     Dog=?t:timetrap(?t:minutes(2)),
     [{watchdog, Dog}|Config].
 
-fin_per_testcase(_Case, _Config) ->
+end_per_testcase(_Case, _Config) ->
     Dog=?config(watchdog, _Config),
     test_server:timetrap_cancel(Dog),
     ok.
-- 
cgit v1.2.3


From 4a1a40f8ce37e1790c0b519ba2e339b8dc96d770 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Tue, 12 Oct 2010 10:30:46 +0200
Subject: Update tools tests to conform with common_test standard

---
 lib/tools/test/cover_SUITE.erl      | 37 +++++++++++++++++++----------
 lib/tools/test/cprof_SUITE.erl      | 28 +++++++++++++---------
 lib/tools/test/emem_SUITE.erl       | 47 +++++++++++++++++++++----------------
 lib/tools/test/eprof_SUITE.erl      | 17 +++++++++++---
 lib/tools/test/fprof_SUITE.erl      | 33 ++++++++++++++++----------
 lib/tools/test/instrument_SUITE.erl | 17 +++++++++++---
 lib/tools/test/lcnt_SUITE.erl       | 19 +++++++++++----
 lib/tools/test/make_SUITE.erl       | 20 ++++++++++++----
 lib/tools/test/tools.spec           |  2 +-
 lib/tools/test/tools_SUITE.erl      | 20 +++++++++++-----
 lib/tools/test/xref_SUITE.erl       | 45 +++++++++++++++++++++--------------
 11 files changed, 188 insertions(+), 97 deletions(-)

(limited to 'lib/tools')

diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index 7169412bcd..aeda99c5fd 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -18,13 +18,13 @@
 %%
 -module(cover_SUITE).
 
--export([all/1]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([start/1, compile/1, analyse/1, misc/1, stop/1, 
 	 distribution/1, export_import/1,
 	 otp_5031/1, eif/1, otp_5305/1, otp_5418/1, otp_6115/1, otp_7095/1,
          otp_8188/1, otp_8270/1, otp_8273/1, otp_8340/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %%----------------------------------------------------------------------
 %% The following directory structure is assumed:
@@ -37,17 +37,28 @@
 %%                                             y
 %%----------------------------------------------------------------------
 
-all(suite) -> 
-    case whereis(cover_server) of
-	undefined ->
-	    [start, compile, analyse, misc, stop, distribution,
-	     export_import,
-	     otp_5031, eif, otp_5305, otp_5418, otp_6115, otp_7095,
-             otp_8188, otp_8270, otp_8273, otp_8340];
-	_pid ->
-	    {skip,"It looks like the test server is running cover. "
-	          "Can't run cover test."}
-    end.
+all() -> 
+case whereis(cover_server) of
+  undefined ->
+      [start, compile, analyse, misc, stop, distribution,
+       export_import, otp_5031, eif, otp_5305, otp_5418,
+       otp_6115, otp_7095, otp_8188, otp_8270, otp_8273,
+       otp_8340];
+  _pid ->
+      {skip,
+       "It looks like the test server is running "
+       "cover. Can't run cover test."}
+end.
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 start(suite) -> [];
 start(Config) when is_list(Config) ->
diff --git a/lib/tools/test/cprof_SUITE.erl b/lib/tools/test/cprof_SUITE.erl
index f366ac75bc..2f118deebe 100644
--- a/lib/tools/test/cprof_SUITE.erl
+++ b/lib/tools/test/cprof_SUITE.erl
@@ -41,7 +41,7 @@
 -define(config(A,B),config(A,B)).
 -export([config/2]).
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -endif.
  
 -ifdef(debug).
@@ -63,7 +63,7 @@ config(data_dir, _) ->
     "cprof_SUITE_data".
 -else.
 %% When run in test server.
--export([all/1, init_per_testcase/2, end_per_testcase/2, not_run/1]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2, not_run/1]).
 -export([basic/1, on_load/1, modules/1]).
 	 
 init_per_testcase(_Case, Config) ->
@@ -78,15 +78,21 @@ end_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
-all(doc) ->
-    ["Test the cprof profiling tool."];
-all(suite) ->
-    case test_server:is_native(?MODULE) of
-	true -> [not_run];
-	false -> [basic, on_load, modules]
-%, on_and_off, info, 
-%		  pause_and_restart, combo]
-    end.
+all() -> 
+case test_server:is_native(cprof_SUITE) of
+  true -> [not_run];
+  false -> [basic, on_load, modules]
+end.
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 not_run(Config) when is_list(Config) -> 
     {skipped,"Native code"}.
diff --git a/lib/tools/test/emem_SUITE.erl b/lib/tools/test/emem_SUITE.erl
index 1bc1c2dcee..fdedcef650 100644
--- a/lib/tools/test/emem_SUITE.erl
+++ b/lib/tools/test/emem_SUITE.erl
@@ -24,7 +24,7 @@
 	 receive_and_save_trace/2, send_trace/2]).
 
 
--export([all/1, init_per_testcase/2, end_per_testcase/2]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2]).
 
 -export([live_node/1,
 	 'sparc_sunos5.8_32b_emt2.0'/1,
@@ -41,7 +41,7 @@
 
 -include_lib("kernel/include/file.hrl").
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -define(DEFAULT_TIMEOUT, ?t:minutes(5)).
 
@@ -65,26 +65,33 @@
 %%
 %%
 
-all(doc) -> [];
-all(suite) ->
+all() -> 
     case is_debug_compiled() of
-	true -> {skipped, "Not run when debug compiled"};
+	true -> {skip, "Not run when debug compiled"};
 	false -> test_cases()
     end.
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 		 
-test_cases() ->
-    [live_node,
-     'sparc_sunos5.8_32b_emt2.0',
-     'pc_win2000_32b_emt2.0',
-     'pc.smp_linux2.2.19pre17_32b_emt2.0',
-     'powerpc_darwin7.7.0_32b_emt2.0',
-     'alpha_osf1v5.1_64b_emt2.0',
-     'sparc_sunos5.8_64b_emt2.0',
-     'sparc_sunos5.8_32b_emt1.0',
-     'pc_win2000_32b_emt1.0',
-     'powerpc_darwin7.7.0_32b_emt1.0',
-     'alpha_osf1v5.1_64b_emt1.0',
-     'sparc_sunos5.8_64b_emt1.0'].
+test_cases() -> 
+[live_node, 'sparc_sunos5.8_32b_emt2.0',
+ 'pc_win2000_32b_emt2.0',
+ 'pc.smp_linux2.2.19pre17_32b_emt2.0',
+ 'powerpc_darwin7.7.0_32b_emt2.0',
+ 'alpha_osf1v5.1_64b_emt2.0',
+ 'sparc_sunos5.8_64b_emt2.0',
+ 'sparc_sunos5.8_32b_emt1.0', 'pc_win2000_32b_emt1.0',
+ 'powerpc_darwin7.7.0_32b_emt1.0',
+ 'alpha_osf1v5.1_64b_emt1.0',
+ 'sparc_sunos5.8_64b_emt1.0'].
 
 init_per_testcase(Case, Config) when is_list(Config) ->
     case maybe_skip(Config) of
@@ -700,8 +707,8 @@ start_node(Name, Args) ->
 % stop_node(Node) ->
 %     ?t:stop_node(Node).
 
-is_debug_compiled() ->
-    is_debug_compiled(erlang:system_info(system_version)).
+is_debug_compiled() -> 
+is_debug_compiled(erlang:system_info(system_version)).
 
 is_debug_compiled([$d,$e,$b,$u,$g | _]) ->
     true;
diff --git a/lib/tools/test/eprof_SUITE.erl b/lib/tools/test/eprof_SUITE.erl
index 67607c6cf2..fa5fdf30e4 100644
--- a/lib/tools/test/eprof_SUITE.erl
+++ b/lib/tools/test/eprof_SUITE.erl
@@ -18,11 +18,22 @@
 %%
 -module(eprof_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
--export([all/1,tiny/1,eed/1,basic/1]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2,tiny/1,eed/1,basic/1]).
+
+all() -> 
+[basic, tiny, eed].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
 
-all(suite) -> [basic,tiny,eed].
 
 basic(suite) -> [];
 basic(Config) when is_list(Config) ->
diff --git a/lib/tools/test/fprof_SUITE.erl b/lib/tools/test/fprof_SUITE.erl
index 1cd9ac7824..5ecb150e09 100644
--- a/lib/tools/test/fprof_SUITE.erl
+++ b/lib/tools/test/fprof_SUITE.erl
@@ -18,10 +18,10 @@
 %%
 -module(fprof_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Test server framework exports
--export([all/1, not_run/1]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, not_run/1]).
 
 %% Test suites
 -export([stack_seq/1, tail_seq/1, create_file_slow/1, spawn_simple/1,
@@ -54,17 +54,24 @@
 
 
 
-all(doc) ->
-    ["Test the 'fprof' profiling tool."];
-all(suite) ->
-    case test_server:is_native(?MODULE) of
-	true ->
-	    [not_run];
-	false ->
-	    [stack_seq, tail_seq, create_file_slow, spawn_simple,
-	     imm_tail_seq, imm_create_file_slow, imm_compile,
-	     cpu_create_file_slow]
-    end.
+all() -> 
+case test_server:is_native(fprof_SUITE) of
+  true -> [not_run];
+  false ->
+      [stack_seq, tail_seq, create_file_slow, spawn_simple,
+       imm_tail_seq, imm_create_file_slow, imm_compile,
+       cpu_create_file_slow]
+end.
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 not_run(Config) when is_list(Config) ->
     {skipped, "Native code"}.
diff --git a/lib/tools/test/instrument_SUITE.erl b/lib/tools/test/instrument_SUITE.erl
index 6a0d1965fe..f607dab727 100644
--- a/lib/tools/test/instrument_SUITE.erl
+++ b/lib/tools/test/instrument_SUITE.erl
@@ -18,11 +18,11 @@
 %%
 -module(instrument_SUITE).
 
--export([all/1,init_per_testcase/2,end_per_testcase/2]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2]).
 
 -export(['+Mim true'/1, '+Mis true'/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 init_per_testcase(_Case, Config) ->
     ?line Dog=?t:timetrap(10000),
@@ -33,7 +33,18 @@ end_per_testcase(_Case, Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
-all(suite) -> ['+Mim true', '+Mis true'].
+all() -> 
+['+Mim true', '+Mis true'].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 '+Mim true'(doc) -> ["Check that memory data can be read and processed"];
 '+Mim true'(suite) -> [];
diff --git a/lib/tools/test/lcnt_SUITE.erl b/lib/tools/test/lcnt_SUITE.erl
index e6866f721d..eeae182d8e 100644
--- a/lib/tools/test/lcnt_SUITE.erl
+++ b/lib/tools/test/lcnt_SUITE.erl
@@ -18,10 +18,10 @@
 %%
 
 -module(lcnt_SUITE).
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Test server specific exports
--export([all/1]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([init_per_suite/1, end_per_suite/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
@@ -51,9 +51,18 @@ end_per_testcase(_Case, Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
-all(suite) ->
-    % Test cases
-    [load_v1, conflicts, locations, swap_keys].
+all() -> 
+[load_v1, conflicts, locations, swap_keys].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 %%----------------------------------------------------------------------
 %% Tests
diff --git a/lib/tools/test/make_SUITE.erl b/lib/tools/test/make_SUITE.erl
index 72dccdb465..d0692c9d6a 100644
--- a/lib/tools/test/make_SUITE.erl
+++ b/lib/tools/test/make_SUITE.erl
@@ -18,12 +18,12 @@
 %%
 -module(make_SUITE).
 
--export([all/1, make_all/1, make_files/1]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, make_all/1, make_files/1]).
 -export([otp_6057_init/1,
 	 otp_6057_a/1, otp_6057_b/1, otp_6057_c/1,
 	 otp_6057_end/1]).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 -include_lib("kernel/include/file.hrl").
 
@@ -35,9 +35,19 @@
 %% that the file :"test5.erl" shall be compiled with the 'S' option,
 %% i.e. produce "test5.S" instead of "test5.<objext>"
 
-all(suite) -> [make_all, make_files,
-	       {conf, otp_6057_init,
-		[otp_6057_a,otp_6057_b,otp_6057_c], otp_6057_end}].
+all() -> 
+[make_all, make_files, otp_6057_a, otp_6057_b,
+ otp_6057_c].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 test_files() -> ["test1", "test2", "test3", "test4"].
 
diff --git a/lib/tools/test/tools.spec b/lib/tools/test/tools.spec
index 93d5930472..05a5b8fca6 100644
--- a/lib/tools/test/tools.spec
+++ b/lib/tools/test/tools.spec
@@ -1 +1 @@
-{topcase, {dir, "../tools_test"}}.
+{suites,"tools_test",all}.
diff --git a/lib/tools/test/tools_SUITE.erl b/lib/tools/test/tools_SUITE.erl
index 642703cc1b..39d22b67cd 100644
--- a/lib/tools/test/tools_SUITE.erl
+++ b/lib/tools/test/tools_SUITE.erl
@@ -18,23 +18,31 @@
 %%
 -module(tools_SUITE).
 
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 
 %% Default timetrap timeout (set in init_per_testcase).
 -define(default_timeout, ?t:minutes(1)).
 -define(application, tools).
 
 %% Test server specific exports
--export([all/1]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Test cases must be exported.
 -export([app_test/1]).
 
-all(doc) ->
-    [];
-all(suite) ->
-    [app_test].
+all() -> 
+[app_test].
+
+groups() -> 
+    [].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 init_per_testcase(_Case, Config) ->
     ?line Dog=test_server:timetrap(?default_timeout),
diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl
index e10448862e..7ce77b94c5 100644
--- a/lib/tools/test/xref_SUITE.erl
+++ b/lib/tools/test/xref_SUITE.erl
@@ -29,28 +29,28 @@
 -define(privdir, "xref_SUITE_priv").
 -define(copydir, "xref_SUITE_priv/datacopy").
 -else.
--include("test_server.hrl").
+-include_lib("test_server/include/test_server.hrl").
 -define(format(S, A), ok).
 -define(datadir, ?config(data_dir, Conf)).
 -define(privdir, ?config(priv_dir, Conf)).
 -define(copydir, ?config(copy_dir, Conf)).
 -endif.
 
--export([all/1, init/1, fini/1]).
+-export([all/0,groups/0,init_per_group/2,end_per_group/2, init/1, fini/1]).
 
--export([xref/1,
+-export([
 	 addrem/1, convert/1, intergraph/1, lines/1, loops/1,
 	 no_data/1, modules/1]).
 
--export([files/1,
+-export([
 	 add/1, default/1, info/1, lib/1, read/1, read2/1, remove/1,
 	 replace/1, update/1, deprecated/1, trycatch/1,
          abstract_modules/1, fun_mfa/1, qlc/1]).
 
--export([analyses/1,
+-export([
 	 analyze/1, basic/1, md/1, q/1, variables/1, unused_locals/1]).
 
--export([misc/1,
+-export([
 	 format_error/1, otp_7423/1, otp_7831/1]).
 
 -import(lists, [append/2, flatten/1, keysearch/3, member/2, sort/1, usort/1]).
@@ -68,8 +68,28 @@
 
 -include_lib("tools/src/xref.hrl").
 
-all(suite) ->
-    {conf, init, [xref, files, analyses, misc], fini}.
+all() -> 
+[{group, xref}, {group, files}, {group, analyses},
+ {group, misc}].
+
+groups() -> 
+    [{xref, [],
+  [addrem, convert, intergraph, lines, loops, no_data,
+   modules]},
+ {files, [],
+  [add, default, info, lib, read, read2, remove, replace,
+   update, deprecated, trycatch, abstract_modules, fun_mfa,
+   qlc]},
+ {analyses, [],
+  [analyze, basic, md, q, variables, unused_locals]},
+ {misc, [], [format_error, otp_7423, otp_7831]}].
+
+init_per_group(_GroupName, Config) ->
+	Config.
+
+end_per_group(_GroupName, Config) ->
+	Config.
+
 
 init(Conf) when is_list(Conf) ->
     DataDir = ?datadir,
@@ -96,8 +116,6 @@ end_per_testcase(_Case, _Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
-xref(suite) ->
-    [addrem, convert, intergraph, lines, loops, no_data, modules].
 
 %% Seems a bit short...
 addrem(suite) -> [];
@@ -680,9 +698,6 @@ modules(Conf) when is_list(Conf) ->
     ?line ok = xref_base:delete(S),
     ok.
 
-files(suite) ->
-    [add, default, info, lib, read, read2, remove, replace, update,
-     deprecated, trycatch, abstract_modules, fun_mfa, qlc].
 
 add(suite) -> [];
 add(doc) -> ["Add modules, applications, releases, directories"];
@@ -1788,8 +1803,6 @@ qlc(Conf) when is_list(Conf) ->
     ok.
 
 
-analyses(suite) ->
-    [analyze, basic, md, q, variables, unused_locals].
 
 analyze(suite) -> [];
 analyze(doc) -> ["Simple analyses"];
@@ -2312,8 +2325,6 @@ unused_locals(Conf) when is_list(Conf) ->
     ?line ok = file:delete(Beam2),
     ok.
 
-misc(suite) ->
-    [format_error, otp_7423, otp_7831].
 
 format_error(suite) -> [];
 format_error(doc) -> ["Format error messages"];
-- 
cgit v1.2.3


From 83f932257470f5ae01fc61130e997fdea0562653 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Mon, 6 Dec 2010 16:48:31 +0100
Subject: Add ts_install_scb to suite/0

---
 lib/tools/test/cover_SUITE.erl      | 4 +++-
 lib/tools/test/cprof_SUITE.erl      | 4 +++-
 lib/tools/test/emem_SUITE.erl       | 4 +++-
 lib/tools/test/eprof_SUITE.erl      | 4 +++-
 lib/tools/test/fprof_SUITE.erl      | 4 +++-
 lib/tools/test/instrument_SUITE.erl | 4 +++-
 lib/tools/test/lcnt_SUITE.erl       | 4 +++-
 lib/tools/test/make_SUITE.erl       | 6 ++++--
 lib/tools/test/tools_SUITE.erl      | 4 +++-
 lib/tools/test/xref_SUITE.erl       | 4 +++-
 10 files changed, 31 insertions(+), 11 deletions(-)

(limited to 'lib/tools')

diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index aeda99c5fd..5540754270 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(cover_SUITE).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([start/1, compile/1, analyse/1, misc/1, stop/1, 
 	 distribution/1, export_import/1,
 	 otp_5031/1, eif/1, otp_5305/1, otp_5418/1, otp_6115/1, otp_7095/1,
@@ -37,6 +37,8 @@
 %%                                             y
 %%----------------------------------------------------------------------
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 case whereis(cover_server) of
   undefined ->
diff --git a/lib/tools/test/cprof_SUITE.erl b/lib/tools/test/cprof_SUITE.erl
index 2f118deebe..679795df60 100644
--- a/lib/tools/test/cprof_SUITE.erl
+++ b/lib/tools/test/cprof_SUITE.erl
@@ -63,7 +63,7 @@ config(data_dir, _) ->
     "cprof_SUITE_data".
 -else.
 %% When run in test server.
--export([all/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2, not_run/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2, not_run/1]).
 -export([basic/1, on_load/1, modules/1]).
 	 
 init_per_testcase(_Case, Config) ->
@@ -78,6 +78,8 @@ end_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 case test_server:is_native(cprof_SUITE) of
   true -> [not_run];
diff --git a/lib/tools/test/emem_SUITE.erl b/lib/tools/test/emem_SUITE.erl
index fdedcef650..6c67375e53 100644
--- a/lib/tools/test/emem_SUITE.erl
+++ b/lib/tools/test/emem_SUITE.erl
@@ -24,7 +24,7 @@
 	 receive_and_save_trace/2, send_trace/2]).
 
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2]).
 
 -export([live_node/1,
 	 'sparc_sunos5.8_32b_emt2.0'/1,
@@ -65,6 +65,8 @@
 %%
 %%
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
     case is_debug_compiled() of
 	true -> {skip, "Not run when debug compiled"};
diff --git a/lib/tools/test/eprof_SUITE.erl b/lib/tools/test/eprof_SUITE.erl
index fa5fdf30e4..a24e822305 100644
--- a/lib/tools/test/eprof_SUITE.erl
+++ b/lib/tools/test/eprof_SUITE.erl
@@ -20,7 +20,9 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2,tiny/1,eed/1,basic/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,tiny/1,eed/1,basic/1]).
+
+suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
 [basic, tiny, eed].
diff --git a/lib/tools/test/fprof_SUITE.erl b/lib/tools/test/fprof_SUITE.erl
index 5ecb150e09..98033560c3 100644
--- a/lib/tools/test/fprof_SUITE.erl
+++ b/lib/tools/test/fprof_SUITE.erl
@@ -21,7 +21,7 @@
 -include_lib("test_server/include/test_server.hrl").
 
 %% Test server framework exports
--export([all/0,groups/0,init_per_group/2,end_per_group/2, not_run/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, not_run/1]).
 
 %% Test suites
 -export([stack_seq/1, tail_seq/1, create_file_slow/1, spawn_simple/1,
@@ -54,6 +54,8 @@
 
 
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 case test_server:is_native(fprof_SUITE) of
   true -> [not_run];
diff --git a/lib/tools/test/instrument_SUITE.erl b/lib/tools/test/instrument_SUITE.erl
index f607dab727..5b13a42143 100644
--- a/lib/tools/test/instrument_SUITE.erl
+++ b/lib/tools/test/instrument_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(instrument_SUITE).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2]).
 
 -export(['+Mim true'/1, '+Mis true'/1]).
 
@@ -33,6 +33,8 @@ end_per_testcase(_Case, Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 ['+Mim true', '+Mis true'].
 
diff --git a/lib/tools/test/lcnt_SUITE.erl b/lib/tools/test/lcnt_SUITE.erl
index eeae182d8e..3de25766fb 100644
--- a/lib/tools/test/lcnt_SUITE.erl
+++ b/lib/tools/test/lcnt_SUITE.erl
@@ -21,7 +21,7 @@
 -include_lib("test_server/include/test_server.hrl").
 
 %% Test server specific exports
--export([all/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([init_per_suite/1, end_per_suite/1]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
@@ -51,6 +51,8 @@ end_per_testcase(_Case, Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [load_v1, conflicts, locations, swap_keys].
 
diff --git a/lib/tools/test/make_SUITE.erl b/lib/tools/test/make_SUITE.erl
index d0692c9d6a..a4c9546eb8 100644
--- a/lib/tools/test/make_SUITE.erl
+++ b/lib/tools/test/make_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(make_SUITE).
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, make_all/1, make_files/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, make_all/1, make_files/1]).
 -export([otp_6057_init/1,
 	 otp_6057_a/1, otp_6057_b/1, otp_6057_c/1,
 	 otp_6057_end/1]).
@@ -35,6 +35,8 @@
 %% that the file :"test5.erl" shall be compiled with the 'S' option,
 %% i.e. produce "test5.S" instead of "test5.<objext>"
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [make_all, make_files, otp_6057_a, otp_6057_b,
  otp_6057_c].
@@ -156,7 +158,7 @@ otp_6057_init(Config) when is_list(Config) ->
 otp_6057_a(suite) ->
     [];
 otp_6057_a(doc) ->
-    ["Test that make:all/0 looks for object file in correct place"];
+    ["Test that make:all/0, suite/0 looks for object file in correct place"];
 otp_6057_a(Config) when is_list(Config) ->
     ?line PrivDir = ?config(priv_dir, Config),
 
diff --git a/lib/tools/test/tools_SUITE.erl b/lib/tools/test/tools_SUITE.erl
index 39d22b67cd..f587098a15 100644
--- a/lib/tools/test/tools_SUITE.erl
+++ b/lib/tools/test/tools_SUITE.erl
@@ -25,12 +25,14 @@
 -define(application, tools).
 
 %% Test server specific exports
--export([all/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Test cases must be exported.
 -export([app_test/1]).
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [app_test].
 
diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl
index 7ce77b94c5..9d5597447e 100644
--- a/lib/tools/test/xref_SUITE.erl
+++ b/lib/tools/test/xref_SUITE.erl
@@ -36,7 +36,7 @@
 -define(copydir, ?config(copy_dir, Conf)).
 -endif.
 
--export([all/0,groups/0,init_per_group/2,end_per_group/2, init/1, fini/1]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, init/1, fini/1]).
 
 -export([
 	 addrem/1, convert/1, intergraph/1, lines/1, loops/1,
@@ -68,6 +68,8 @@
 
 -include_lib("tools/src/xref.hrl").
 
+suite() -> [{suite_callbacks,[ts_install_scb]}].
+
 all() -> 
 [{group, xref}, {group, files}, {group, analyses},
  {group, misc}].
-- 
cgit v1.2.3


From 8fd1f31f3074bc9444a0769418506b1ccc2041d3 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Tue, 7 Dec 2010 11:35:13 +0100
Subject: Add init_per_suite and end_per_suite

---
 lib/tools/test/cover_SUITE.erl      | 8 +++++++-
 lib/tools/test/cprof_SUITE.erl      | 8 +++++++-
 lib/tools/test/eprof_SUITE.erl      | 8 +++++++-
 lib/tools/test/fprof_SUITE.erl      | 8 +++++++-
 lib/tools/test/instrument_SUITE.erl | 8 +++++++-
 lib/tools/test/make_SUITE.erl       | 8 +++++++-
 lib/tools/test/tools_SUITE.erl      | 8 +++++++-
 lib/tools/test/xref_SUITE.erl       | 8 +++++++-
 8 files changed, 56 insertions(+), 8 deletions(-)

(limited to 'lib/tools')

diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index 5540754270..fe3e987790 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(cover_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
 -export([start/1, compile/1, analyse/1, misc/1, stop/1, 
 	 distribution/1, export_import/1,
 	 otp_5031/1, eif/1, otp_5305/1, otp_5418/1, otp_6115/1, otp_7095/1,
@@ -55,6 +55,12 @@ end.
 groups() -> 
     [].
 
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
 init_per_group(_GroupName, Config) ->
 	Config.
 
diff --git a/lib/tools/test/cprof_SUITE.erl b/lib/tools/test/cprof_SUITE.erl
index 679795df60..64287c8ba1 100644
--- a/lib/tools/test/cprof_SUITE.erl
+++ b/lib/tools/test/cprof_SUITE.erl
@@ -63,7 +63,7 @@ config(data_dir, _) ->
     "cprof_SUITE_data".
 -else.
 %% When run in test server.
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2, not_run/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2, not_run/1]).
 -export([basic/1, on_load/1, modules/1]).
 	 
 init_per_testcase(_Case, Config) ->
@@ -89,6 +89,12 @@ end.
 groups() -> 
     [].
 
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
 init_per_group(_GroupName, Config) ->
 	Config.
 
diff --git a/lib/tools/test/eprof_SUITE.erl b/lib/tools/test/eprof_SUITE.erl
index a24e822305..492e613a3f 100644
--- a/lib/tools/test/eprof_SUITE.erl
+++ b/lib/tools/test/eprof_SUITE.erl
@@ -20,7 +20,7 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,tiny/1,eed/1,basic/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2,tiny/1,eed/1,basic/1]).
 
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
@@ -30,6 +30,12 @@ all() ->
 groups() -> 
     [].
 
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
 init_per_group(_GroupName, Config) ->
 	Config.
 
diff --git a/lib/tools/test/fprof_SUITE.erl b/lib/tools/test/fprof_SUITE.erl
index 98033560c3..3cfff2473f 100644
--- a/lib/tools/test/fprof_SUITE.erl
+++ b/lib/tools/test/fprof_SUITE.erl
@@ -21,7 +21,7 @@
 -include_lib("test_server/include/test_server.hrl").
 
 %% Test server framework exports
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, not_run/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, not_run/1]).
 
 %% Test suites
 -export([stack_seq/1, tail_seq/1, create_file_slow/1, spawn_simple/1,
@@ -68,6 +68,12 @@ end.
 groups() -> 
     [].
 
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
 init_per_group(_GroupName, Config) ->
 	Config.
 
diff --git a/lib/tools/test/instrument_SUITE.erl b/lib/tools/test/instrument_SUITE.erl
index 5b13a42143..4ce5965d6f 100644
--- a/lib/tools/test/instrument_SUITE.erl
+++ b/lib/tools/test/instrument_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(instrument_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2]).
 
 -export(['+Mim true'/1, '+Mis true'/1]).
 
@@ -41,6 +41,12 @@ all() ->
 groups() -> 
     [].
 
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
 init_per_group(_GroupName, Config) ->
 	Config.
 
diff --git a/lib/tools/test/make_SUITE.erl b/lib/tools/test/make_SUITE.erl
index a4c9546eb8..5c6d388843 100644
--- a/lib/tools/test/make_SUITE.erl
+++ b/lib/tools/test/make_SUITE.erl
@@ -18,7 +18,7 @@
 %%
 -module(make_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, make_all/1, make_files/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, make_all/1, make_files/1]).
 -export([otp_6057_init/1,
 	 otp_6057_a/1, otp_6057_b/1, otp_6057_c/1,
 	 otp_6057_end/1]).
@@ -44,6 +44,12 @@ all() ->
 groups() -> 
     [].
 
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
 init_per_group(_GroupName, Config) ->
 	Config.
 
diff --git a/lib/tools/test/tools_SUITE.erl b/lib/tools/test/tools_SUITE.erl
index f587098a15..ee50283895 100644
--- a/lib/tools/test/tools_SUITE.erl
+++ b/lib/tools/test/tools_SUITE.erl
@@ -25,7 +25,7 @@
 -define(application, tools).
 
 %% Test server specific exports
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Test cases must be exported.
@@ -39,6 +39,12 @@ all() ->
 groups() -> 
     [].
 
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
 init_per_group(_GroupName, Config) ->
 	Config.
 
diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl
index 9d5597447e..7dccc7aab4 100644
--- a/lib/tools/test/xref_SUITE.erl
+++ b/lib/tools/test/xref_SUITE.erl
@@ -36,7 +36,7 @@
 -define(copydir, ?config(copy_dir, Conf)).
 -endif.
 
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, init/1, fini/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, init/1, fini/1]).
 
 -export([
 	 addrem/1, convert/1, intergraph/1, lines/1, loops/1,
@@ -86,6 +86,12 @@ groups() ->
   [analyze, basic, md, q, variables, unused_locals]},
  {misc, [], [format_error, otp_7423, otp_7831]}].
 
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
 init_per_group(_GroupName, Config) ->
 	Config.
 
-- 
cgit v1.2.3


From 307dc266144daa134fc37495362af55a95c06f74 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Tue, 14 Dec 2010 17:52:01 +0100
Subject: Fix formatting for tools

---
 lib/tools/test/cover_SUITE.erl      | 29 +++++++++++++++--------------
 lib/tools/test/cprof_SUITE.erl      | 17 ++++++++++-------
 lib/tools/test/emem_SUITE.erl       | 29 +++++++++++++++--------------
 lib/tools/test/eprof_SUITE.erl      |  9 +++++----
 lib/tools/test/fprof_SUITE.erl      | 21 +++++++++++----------
 lib/tools/test/instrument_SUITE.erl | 10 ++++++----
 lib/tools/test/lcnt_SUITE.erl       |  6 +++---
 lib/tools/test/make_SUITE.erl       | 13 +++++++------
 lib/tools/test/tools_SUITE.erl      |  9 +++++----
 lib/tools/test/xref_SUITE.erl       | 31 ++++++++++++++++---------------
 10 files changed, 93 insertions(+), 81 deletions(-)

(limited to 'lib/tools')

diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index fe3e987790..ce88e973ce 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -18,7 +18,8 @@
 %%
 -module(cover_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 -export([start/1, compile/1, analyse/1, misc/1, stop/1, 
 	 distribution/1, export_import/1,
 	 otp_5031/1, eif/1, otp_5305/1, otp_5418/1, otp_6115/1, otp_7095/1,
@@ -40,17 +41,17 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-case whereis(cover_server) of
-  undefined ->
-      [start, compile, analyse, misc, stop, distribution,
-       export_import, otp_5031, eif, otp_5305, otp_5418,
-       otp_6115, otp_7095, otp_8188, otp_8270, otp_8273,
-       otp_8340];
-  _pid ->
-      {skip,
-       "It looks like the test server is running "
-       "cover. Can't run cover test."}
-end.
+    case whereis(cover_server) of
+	undefined ->
+	    [start, compile, analyse, misc, stop, distribution,
+	     export_import, otp_5031, eif, otp_5305, otp_5418,
+	     otp_6115, otp_7095, otp_8188, otp_8270, otp_8273,
+	     otp_8340];
+	_pid ->
+	    {skip,
+	     "It looks like the test server is running "
+	     "cover. Can't run cover test."}
+    end.
 
 groups() -> 
     [].
@@ -62,10 +63,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 start(suite) -> [];
diff --git a/lib/tools/test/cprof_SUITE.erl b/lib/tools/test/cprof_SUITE.erl
index 64287c8ba1..158a4c696a 100644
--- a/lib/tools/test/cprof_SUITE.erl
+++ b/lib/tools/test/cprof_SUITE.erl
@@ -63,7 +63,10 @@ config(data_dir, _) ->
     "cprof_SUITE_data".
 -else.
 %% When run in test server.
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2, not_run/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, 
+	 init_per_testcase/2, end_per_testcase/2, 
+	 not_run/1]).
 -export([basic/1, on_load/1, modules/1]).
 	 
 init_per_testcase(_Case, Config) ->
@@ -81,10 +84,10 @@ end_per_testcase(_Case, Config) ->
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-case test_server:is_native(cprof_SUITE) of
-  true -> [not_run];
-  false -> [basic, on_load, modules]
-end.
+    case test_server:is_native(cprof_SUITE) of
+	true -> [not_run];
+	false -> [basic, on_load, modules]
+    end.
 
 groups() -> 
     [].
@@ -96,10 +99,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 not_run(Config) when is_list(Config) -> 
diff --git a/lib/tools/test/emem_SUITE.erl b/lib/tools/test/emem_SUITE.erl
index 6c67375e53..b0812922ac 100644
--- a/lib/tools/test/emem_SUITE.erl
+++ b/lib/tools/test/emem_SUITE.erl
@@ -24,7 +24,8 @@
 	 receive_and_save_trace/2, send_trace/2]).
 
 
--export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, init_per_testcase/2, end_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_group/2,end_per_group/2, 
+	 init_per_testcase/2, end_per_testcase/2]).
 
 -export([live_node/1,
 	 'sparc_sunos5.8_32b_emt2.0'/1,
@@ -77,23 +78,23 @@ groups() ->
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
+
 
-		 
 test_cases() -> 
-[live_node, 'sparc_sunos5.8_32b_emt2.0',
- 'pc_win2000_32b_emt2.0',
- 'pc.smp_linux2.2.19pre17_32b_emt2.0',
- 'powerpc_darwin7.7.0_32b_emt2.0',
- 'alpha_osf1v5.1_64b_emt2.0',
- 'sparc_sunos5.8_64b_emt2.0',
- 'sparc_sunos5.8_32b_emt1.0', 'pc_win2000_32b_emt1.0',
- 'powerpc_darwin7.7.0_32b_emt1.0',
- 'alpha_osf1v5.1_64b_emt1.0',
- 'sparc_sunos5.8_64b_emt1.0'].
+    [live_node, 'sparc_sunos5.8_32b_emt2.0',
+     'pc_win2000_32b_emt2.0',
+     'pc.smp_linux2.2.19pre17_32b_emt2.0',
+     'powerpc_darwin7.7.0_32b_emt2.0',
+     'alpha_osf1v5.1_64b_emt2.0',
+     'sparc_sunos5.8_64b_emt2.0',
+     'sparc_sunos5.8_32b_emt1.0', 'pc_win2000_32b_emt1.0',
+     'powerpc_darwin7.7.0_32b_emt1.0',
+     'alpha_osf1v5.1_64b_emt1.0',
+     'sparc_sunos5.8_64b_emt1.0'].
 
 init_per_testcase(Case, Config) when is_list(Config) ->
     case maybe_skip(Config) of
diff --git a/lib/tools/test/eprof_SUITE.erl b/lib/tools/test/eprof_SUITE.erl
index 492e613a3f..4f1ec94e3d 100644
--- a/lib/tools/test/eprof_SUITE.erl
+++ b/lib/tools/test/eprof_SUITE.erl
@@ -20,12 +20,13 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2,tiny/1,eed/1,basic/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,tiny/1,eed/1,basic/1]).
 
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[basic, tiny, eed].
+    [basic, tiny, eed].
 
 groups() -> 
     [].
@@ -37,10 +38,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 basic(suite) -> [];
diff --git a/lib/tools/test/fprof_SUITE.erl b/lib/tools/test/fprof_SUITE.erl
index 3cfff2473f..82a7e81d44 100644
--- a/lib/tools/test/fprof_SUITE.erl
+++ b/lib/tools/test/fprof_SUITE.erl
@@ -21,7 +21,8 @@
 -include_lib("test_server/include/test_server.hrl").
 
 %% Test server framework exports
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, not_run/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, not_run/1]).
 
 %% Test suites
 -export([stack_seq/1, tail_seq/1, create_file_slow/1, spawn_simple/1,
@@ -57,13 +58,13 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-case test_server:is_native(fprof_SUITE) of
-  true -> [not_run];
-  false ->
-      [stack_seq, tail_seq, create_file_slow, spawn_simple,
-       imm_tail_seq, imm_create_file_slow, imm_compile,
-       cpu_create_file_slow]
-end.
+    case test_server:is_native(fprof_SUITE) of
+	true -> [not_run];
+	false ->
+	    [stack_seq, tail_seq, create_file_slow, spawn_simple,
+	     imm_tail_seq, imm_create_file_slow, imm_compile,
+	     cpu_create_file_slow]
+    end.
 
 groups() -> 
     [].
@@ -75,10 +76,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 not_run(Config) when is_list(Config) ->
diff --git a/lib/tools/test/instrument_SUITE.erl b/lib/tools/test/instrument_SUITE.erl
index 4ce5965d6f..30a7b2b6df 100644
--- a/lib/tools/test/instrument_SUITE.erl
+++ b/lib/tools/test/instrument_SUITE.erl
@@ -18,7 +18,9 @@
 %%
 -module(instrument_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2,init_per_testcase/2,end_per_testcase/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2,
+	 init_per_testcase/2,end_per_testcase/2]).
 
 -export(['+Mim true'/1, '+Mis true'/1]).
 
@@ -36,7 +38,7 @@ end_per_testcase(_Case, Config) ->
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-['+Mim true', '+Mis true'].
+    ['+Mim true', '+Mis true'].
 
 groups() -> 
     [].
@@ -48,10 +50,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 '+Mim true'(doc) -> ["Check that memory data can be read and processed"];
diff --git a/lib/tools/test/lcnt_SUITE.erl b/lib/tools/test/lcnt_SUITE.erl
index 3de25766fb..2df78ee63b 100644
--- a/lib/tools/test/lcnt_SUITE.erl
+++ b/lib/tools/test/lcnt_SUITE.erl
@@ -54,16 +54,16 @@ end_per_testcase(_Case, Config) ->
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[load_v1, conflicts, locations, swap_keys].
+    [load_v1, conflicts, locations, swap_keys].
 
 groups() -> 
     [].
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 %%----------------------------------------------------------------------
diff --git a/lib/tools/test/make_SUITE.erl b/lib/tools/test/make_SUITE.erl
index 5c6d388843..fa88a65443 100644
--- a/lib/tools/test/make_SUITE.erl
+++ b/lib/tools/test/make_SUITE.erl
@@ -18,7 +18,8 @@
 %%
 -module(make_SUITE).
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, make_all/1, make_files/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, make_all/1, make_files/1]).
 -export([otp_6057_init/1,
 	 otp_6057_a/1, otp_6057_b/1, otp_6057_c/1,
 	 otp_6057_end/1]).
@@ -38,11 +39,11 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[make_all, make_files, otp_6057_a, otp_6057_b,
- otp_6057_c].
+    [make_all, make_files, {group, otp_6057}].
 
 groups() -> 
-    [].
+    [{otp_6057,[],[otp_6057_a, otp_6057_b,
+		   otp_6057_c]}].
 
 init_per_suite(Config) ->
     Config.
@@ -51,10 +52,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    otp_6057_init(Config).
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    otp_6057_end(Config).
 
 
 test_files() -> ["test1", "test2", "test3", "test4"].
diff --git a/lib/tools/test/tools_SUITE.erl b/lib/tools/test/tools_SUITE.erl
index ee50283895..2ef69ce9e7 100644
--- a/lib/tools/test/tools_SUITE.erl
+++ b/lib/tools/test/tools_SUITE.erl
@@ -25,7 +25,8 @@
 -define(application, tools).
 
 %% Test server specific exports
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2]).
 -export([init_per_testcase/2, end_per_testcase/2]).
 
 %% Test cases must be exported.
@@ -34,7 +35,7 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[app_test].
+    [app_test].
 
 groups() -> 
     [].
@@ -46,10 +47,10 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init_per_testcase(_Case, Config) ->
diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl
index 7dccc7aab4..e3e8ac3924 100644
--- a/lib/tools/test/xref_SUITE.erl
+++ b/lib/tools/test/xref_SUITE.erl
@@ -36,7 +36,8 @@
 -define(copydir, ?config(copy_dir, Conf)).
 -endif.
 
--export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, init/1, fini/1]).
+-export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
+	 init_per_group/2,end_per_group/2, init/1, fini/1]).
 
 -export([
 	 addrem/1, convert/1, intergraph/1, lines/1, loops/1,
@@ -71,32 +72,32 @@
 suite() -> [{suite_callbacks,[ts_install_scb]}].
 
 all() -> 
-[{group, xref}, {group, files}, {group, analyses},
- {group, misc}].
+    [{group, xref}, {group, files}, {group, analyses},
+     {group, misc}].
 
 groups() -> 
     [{xref, [],
-  [addrem, convert, intergraph, lines, loops, no_data,
-   modules]},
- {files, [],
-  [add, default, info, lib, read, read2, remove, replace,
-   update, deprecated, trycatch, abstract_modules, fun_mfa,
-   qlc]},
- {analyses, [],
-  [analyze, basic, md, q, variables, unused_locals]},
- {misc, [], [format_error, otp_7423, otp_7831]}].
+      [addrem, convert, intergraph, lines, loops, no_data,
+       modules]},
+     {files, [],
+      [add, default, info, lib, read, read2, remove, replace,
+       update, deprecated, trycatch, abstract_modules, fun_mfa,
+       qlc]},
+     {analyses, [],
+      [analyze, basic, md, q, variables, unused_locals]},
+     {misc, [], [format_error, otp_7423, otp_7831]}].
 
 init_per_suite(Config) ->
-    Config.
+    init(Config).
 
 end_per_suite(_Config) ->
     ok.
 
 init_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 end_per_group(_GroupName, Config) ->
-	Config.
+    Config.
 
 
 init(Conf) when is_list(Conf) ->
-- 
cgit v1.2.3


From 5fef403779c4894189abf6fd18e6c8e5d54064c5 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Tue, 7 Dec 2010 17:52:12 +0100
Subject: Update all test specs

---
 lib/tools/test/tools.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/tools')

diff --git a/lib/tools/test/tools.spec b/lib/tools/test/tools.spec
index 05a5b8fca6..1b07cf1cb6 100644
--- a/lib/tools/test/tools.spec
+++ b/lib/tools/test/tools.spec
@@ -1 +1 @@
-{suites,"tools_test",all}.
+{suites,"../tools_test",all}.
-- 
cgit v1.2.3


From cfa01c9bd748df38750dc4841030e6520610538a Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Wed, 12 Jan 2011 14:56:23 +0100
Subject: Update and add cover spec files to work with common_test

---
 lib/tools/test/Makefile    | 6 ++++--
 lib/tools/test/tools.cover | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 lib/tools/test/tools.cover

(limited to 'lib/tools')

diff --git a/lib/tools/test/Makefile b/lib/tools/test/Makefile
index 3a59be758a..826a8f3ee8 100644
--- a/lib/tools/test/Makefile
+++ b/lib/tools/test/Makefile
@@ -39,7 +39,8 @@ INSTALL_PROGS= $(TARGET_FILES)
 
 EMAKEFILE=Emakefile
 
-SPEC_FILES= tools.spec tools.spec.win
+SPEC_FILES= tools.spec
+COVER_FILE = tools.cover
 
 # ----------------------------------------------------
 # Release directory specification
@@ -84,7 +85,8 @@ release_spec: opt
 
 release_tests_spec: make_emakefile
 	$(INSTALL_DIR) $(RELSYSDIR)
-	$(INSTALL_DATA) $(SPEC_FILES) $(EMAKEFILE) $(ERL_FILES) $(RELSYSDIR)
+	$(INSTALL_DATA) $(SPEC_FILES) $(COVER_FILE) $(EMAKEFILE) \
+		$(ERL_FILES) $(RELSYSDIR)
 	chmod -f -R u+w $(RELSYSDIR)
 	@tar cf - *_SUITE_data | (cd $(RELSYSDIR); tar xf -)
 
diff --git a/lib/tools/test/tools.cover b/lib/tools/test/tools.cover
new file mode 100644
index 0000000000..1053be4f0f
--- /dev/null
+++ b/lib/tools/test/tools.cover
@@ -0,0 +1,2 @@
+{incl_app,tools,details}.
+
-- 
cgit v1.2.3


From 308d6638450f5ffc7f432302367e84bcd92ea683 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erix.ericsson.se>
Date: Wed, 9 Feb 2011 19:10:44 +0100
Subject: Rename Suite Callback to Common Test Hook

---
 lib/tools/test/cover_SUITE.erl      | 2 +-
 lib/tools/test/cprof_SUITE.erl      | 2 +-
 lib/tools/test/emem_SUITE.erl       | 2 +-
 lib/tools/test/eprof_SUITE.erl      | 2 +-
 lib/tools/test/fprof_SUITE.erl      | 2 +-
 lib/tools/test/instrument_SUITE.erl | 2 +-
 lib/tools/test/lcnt_SUITE.erl       | 2 +-
 lib/tools/test/make_SUITE.erl       | 2 +-
 lib/tools/test/tools_SUITE.erl      | 2 +-
 lib/tools/test/xref_SUITE.erl       | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'lib/tools')

diff --git a/lib/tools/test/cover_SUITE.erl b/lib/tools/test/cover_SUITE.erl
index ce88e973ce..d9daff7a1f 100644
--- a/lib/tools/test/cover_SUITE.erl
+++ b/lib/tools/test/cover_SUITE.erl
@@ -38,7 +38,7 @@
 %%                                             y
 %%----------------------------------------------------------------------
 
-suite() -> [{suite_callbacks,[ts_install_scb]}].
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     case whereis(cover_server) of
diff --git a/lib/tools/test/cprof_SUITE.erl b/lib/tools/test/cprof_SUITE.erl
index 158a4c696a..b6f786d33f 100644
--- a/lib/tools/test/cprof_SUITE.erl
+++ b/lib/tools/test/cprof_SUITE.erl
@@ -81,7 +81,7 @@ end_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
-suite() -> [{suite_callbacks,[ts_install_scb]}].
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     case test_server:is_native(cprof_SUITE) of
diff --git a/lib/tools/test/emem_SUITE.erl b/lib/tools/test/emem_SUITE.erl
index b0812922ac..8b38e7d3a8 100644
--- a/lib/tools/test/emem_SUITE.erl
+++ b/lib/tools/test/emem_SUITE.erl
@@ -66,7 +66,7 @@
 %%
 %%
 
-suite() -> [{suite_callbacks,[ts_install_scb]}].
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     case is_debug_compiled() of
diff --git a/lib/tools/test/eprof_SUITE.erl b/lib/tools/test/eprof_SUITE.erl
index 4f1ec94e3d..16246d5e0b 100644
--- a/lib/tools/test/eprof_SUITE.erl
+++ b/lib/tools/test/eprof_SUITE.erl
@@ -23,7 +23,7 @@
 -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, 
 	 init_per_group/2,end_per_group/2,tiny/1,eed/1,basic/1]).
 
-suite() -> [{suite_callbacks,[ts_install_scb]}].
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [basic, tiny, eed].
diff --git a/lib/tools/test/fprof_SUITE.erl b/lib/tools/test/fprof_SUITE.erl
index 82a7e81d44..78de77526c 100644
--- a/lib/tools/test/fprof_SUITE.erl
+++ b/lib/tools/test/fprof_SUITE.erl
@@ -55,7 +55,7 @@
 
 
 
-suite() -> [{suite_callbacks,[ts_install_scb]}].
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     case test_server:is_native(fprof_SUITE) of
diff --git a/lib/tools/test/instrument_SUITE.erl b/lib/tools/test/instrument_SUITE.erl
index 30a7b2b6df..6800a94f94 100644
--- a/lib/tools/test/instrument_SUITE.erl
+++ b/lib/tools/test/instrument_SUITE.erl
@@ -35,7 +35,7 @@ end_per_testcase(_Case, Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
-suite() -> [{suite_callbacks,[ts_install_scb]}].
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     ['+Mim true', '+Mis true'].
diff --git a/lib/tools/test/lcnt_SUITE.erl b/lib/tools/test/lcnt_SUITE.erl
index 2df78ee63b..21383fa544 100644
--- a/lib/tools/test/lcnt_SUITE.erl
+++ b/lib/tools/test/lcnt_SUITE.erl
@@ -51,7 +51,7 @@ end_per_testcase(_Case, Config) ->
     ?t:timetrap_cancel(Dog),
     ok.
 
-suite() -> [{suite_callbacks,[ts_install_scb]}].
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [load_v1, conflicts, locations, swap_keys].
diff --git a/lib/tools/test/make_SUITE.erl b/lib/tools/test/make_SUITE.erl
index fa88a65443..524ed04af4 100644
--- a/lib/tools/test/make_SUITE.erl
+++ b/lib/tools/test/make_SUITE.erl
@@ -36,7 +36,7 @@
 %% that the file :"test5.erl" shall be compiled with the 'S' option,
 %% i.e. produce "test5.S" instead of "test5.<objext>"
 
-suite() -> [{suite_callbacks,[ts_install_scb]}].
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [make_all, make_files, {group, otp_6057}].
diff --git a/lib/tools/test/tools_SUITE.erl b/lib/tools/test/tools_SUITE.erl
index 2ef69ce9e7..69dfab8fe7 100644
--- a/lib/tools/test/tools_SUITE.erl
+++ b/lib/tools/test/tools_SUITE.erl
@@ -32,7 +32,7 @@
 %% Test cases must be exported.
 -export([app_test/1]).
 
-suite() -> [{suite_callbacks,[ts_install_scb]}].
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [app_test].
diff --git a/lib/tools/test/xref_SUITE.erl b/lib/tools/test/xref_SUITE.erl
index e3e8ac3924..1fad070b67 100644
--- a/lib/tools/test/xref_SUITE.erl
+++ b/lib/tools/test/xref_SUITE.erl
@@ -69,7 +69,7 @@
 
 -include_lib("tools/src/xref.hrl").
 
-suite() -> [{suite_callbacks,[ts_install_scb]}].
+suite() -> [{ct_hooks,[ts_install_cth]}].
 
 all() -> 
     [{group, xref}, {group, files}, {group, analyses},
-- 
cgit v1.2.3