From bd67967b55a172b46c29a503439feb1e7c58ab06 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Wed, 21 Nov 2012 11:44:19 +0100
Subject: [test_server,common_test] Fix cross cover mechansim

Update the interface for cross cover analysis (collection of cover
data over multiple tests) so it can be used via common_test and
directly with test server.

The concept of 'application' in the cross cover interface is removed
and replaced with an arbitrary Tag=atom() which identifies a test run.
---
 lib/test_server/src/ts.erl | 31 +++----------------------------
 1 file changed, 3 insertions(+), 28 deletions(-)

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

diff --git a/lib/test_server/src/ts.erl b/lib/test_server/src/ts.erl
index 3ddc58fdbc..bb6fb991e0 100644
--- a/lib/test_server/src/ts.erl
+++ b/lib/test_server/src/ts.erl
@@ -160,8 +160,8 @@ help(installed) ->
 	 "                      the given run options\n",
 	 "  ts:cross_cover_analyse(Level)\n"
 	 "                    - Used after ts:run with option cover or \n"
-	 "                      cover_details. Analyses modules specified in\n"
-	 "                      cross.cover.\n"
+	 "                      cover_details. Analyses modules specified with\n"
+	 "                      a 'cross' statement in the cover spec file.\n"
 	 "                      Level can be 'overview' or 'details'.\n",
 	 "  ts:compile_testcases()~n"
 	 "  ts:compile_testcases(Apps)~n"
@@ -506,8 +506,7 @@ cross_cover_analyse([Level]) ->
     cross_cover_analyse(Level);
 cross_cover_analyse(Level) ->
     Apps = get_last_app_tests(),
-    Modules = get_cross_modules(Apps,[]),
-    test_server_ctrl:cross_cover_analyse(Level,Apps,Modules).
+    test_server_ctrl:cross_cover_analyse(Level,Apps).
 
 get_last_app_tests() ->
     AllTests = filelib:wildcard(filename:join(["*","*_test.logs"])),
@@ -536,30 +535,6 @@ get_last_app_tests([Dir|Dirs],RE,Acc) ->
 get_last_app_tests([],_,Acc) ->
     Acc.
 
-get_cross_modules([{App,_}|Apps],Acc) ->
-    Mods = cross_modules(App),
-    get_cross_modules(Apps,lists:umerge(Mods,Acc));
-get_cross_modules([],Acc) ->
-    Acc.
-
-cross_modules(App) ->
-    case default_coverfile(App) of
-	none ->
-	    [];
-	File ->
-	    case catch file:consult(File) of
-		{ok,CoverSpec} ->
-		    case lists:keyfind(cross_apps,1,CoverSpec) of
-			false ->
-			    [];
-			{cross_apps,App,Modules} ->
-			    lists:usort(Modules)
-		    end;
-		_ ->
-		    []
-	    end
-    end.
-
 %%% Implementation.
 
 check_and_run(Fun) ->
-- 
cgit v1.2.3