[test_server] Add test of code cover mechanism

5 files changed, 152 insertions, 24 deletions

diff --git a/lib/test_server/test/test_server_SUITE.erl b/lib/test_server/test/test_server_SUITE.erl
index 95a3423fef..fb82a87fd0 100644
--- a/lib/test_server/test/test_server_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE.erl
@@ -80,7 +80,7 @@ all() ->
     [test_server_SUITE, test_server_parallel01_SUITE,
      test_server_conf02_SUITE, test_server_conf01_SUITE,
      test_server_skip_SUITE, test_server_shuffle01_SUITE,
-     test_server_break_SUITE].
+     test_server_break_SUITE, test_server_cover_SUITE].
 
 
 %%--------------------------------------------------------------------
@@ -93,37 +93,95 @@ test_server_SUITE(Config) ->
 %    rpc:call(Node,dbg, tracer,[]),
 %    rpc:call(Node,dbg, p,[all,c]),
 %    rpc:call(Node,dbg, tpl,[test_server_ctrl,x]),
-    run_test_server_tests("test_server_SUITE", 38, 1, 30,
-			  19, 9, 1, 11, 2, 25, Config).
+    run_test_server_tests("test_server_SUITE",
+			  [{test_server_SUITE,skip_case7,"SKIPPED!"}],
+			  38, 1, 30, 19, 9, 1, 11, 2, 25, Config).
 
 test_server_parallel01_SUITE(Config) ->
-    run_test_server_tests("test_server_parallel01_SUITE", 37, 0, 19, 
-			  19, 0, 0, 0, 0, 37, Config).
+    run_test_server_tests("test_server_parallel01_SUITE", [],
+			  37, 0, 19, 19, 0, 0, 0, 0, 37, Config).
 
 test_server_shuffle01_SUITE(Config) ->
-    run_test_server_tests("test_server_shuffle01_SUITE", 130, 0, 0, 
-			  76, 0, 0, 0, 0, 130, Config).
+    run_test_server_tests("test_server_shuffle01_SUITE", [],
+			  130, 0, 0, 76, 0, 0, 0, 0, 130, Config).
 
 test_server_skip_SUITE(Config) ->
-    run_test_server_tests("test_server_skip_SUITE", 3, 0, 1, 
-			  0, 0, 1, 3, 0, 0, Config).
+    run_test_server_tests("test_server_skip_SUITE", [],
+			  3, 0, 1, 0, 0, 1, 3, 0, 0, Config).
 
 test_server_conf01_SUITE(Config) ->
-    run_test_server_tests("test_server_conf01_SUITE", 24, 0, 12, 
-			  12, 0, 0, 0, 0, 24, Config).
+    run_test_server_tests("test_server_conf01_SUITE", [],
+			  24, 0, 12, 12, 0, 0, 0, 0, 24, Config).
 
 test_server_conf02_SUITE(Config) ->
-    run_test_server_tests("test_server_conf02_SUITE", 26, 0, 12, 
-			  12, 0, 0, 0, 0, 26, Config).
+    run_test_server_tests("test_server_conf02_SUITE", [],
+			  26, 0, 12, 12, 0, 0, 0, 0, 26, Config).
 
 test_server_break_SUITE(Config) ->
-    D = run_test_server_tests("test_server_break_SUITE", 8, 2, 6,
-			  4, 0, 0, 0, 2, 6, Config),
-    D.
+    run_test_server_tests("test_server_break_SUITE", [],
+			  8, 2, 6, 4, 0, 0, 0, 2, 6, Config).
 
-run_test_server_tests(SuiteName, NCases, NFail, NExpected, NSucc, 
+test_server_cover_SUITE(Config) ->
+    case test_server:is_cover() of
+	true ->
+	    {skip, "Cover already running"};
+	false ->
+	    PrivDir = ?config(priv_dir,Config),
+
+	    %% Test suite has two test cases
+	    %%   tc1 calls cover_helper:foo/0
+	    %%   tc2 calls cover_helper:bar/0
+	    %% Each function in cover_helper is one line.
+	    %%
+	    %% First test run skips tc2, so only cover_helper:foo/0 is executed.
+	    %% Cover file specifies to include cover_helper in this test run.
+	    CoverFile1 = filename:join(PrivDir,"t1.cover"),
+	    CoverSpec1 = {include,[cover_helper]},
+	    file:write_file(CoverFile1,io_lib:format("~p.~n",[CoverSpec1])),
+	    run_test_server_tests("test_server_cover_SUITE",
+				  [{test_server_cover_SUITE,tc2,"SKIPPED!"}],
+				  4, 0, 2, 1, 1, 0, 1, 0, 3,
+				  CoverFile1, Config),
+
+	    %% Next test run skips tc1, so only cover_helper:bar/0 is executed.
+	    %% Cover file specifies cross compilation of cover_helper
+	    CoverFile2 = filename:join(PrivDir,"t2.cover"),
+	    CoverSpec2 = {cross,[{t1,[cover_helper]}]},
+	    file:write_file(CoverFile2,io_lib:format("~p.~n",[CoverSpec2])),
+	    run_test_server_tests("test_server_cover_SUITE",
+				  [{test_server_cover_SUITE,tc1,"SKIPPED!"}],
+				  4, 0, 2, 1, 1, 0, 1, 0, 3, CoverFile2, Config),
+
+	    %% Cross cover analyse
+	    WorkDir = ?config(work_dir,Config),
+	    WC = filename:join([WorkDir,"test_server_cover_SUITE.logs","run.*"]),
+	    [D2,D1|_] = lists:reverse(lists:sort(filelib:wildcard(WC))),
+	    TagDirs = [{t1,D1},{t2,D2}],
+	    test_server_ctrl:cross_cover_analyse(details,TagDirs),
+
+	    %% Check that cover log shows only what is really included
+	    %% in the test and cross cover log show the accumulated
+	    %% result.
+	    {ok,Cover1} = file:read_file(filename:join(D1,"cover.log")),
+	    [{cover_helper,{1,1,_}}] = binary_to_term(Cover1),
+	    {ok,Cover2} = file:read_file(filename:join(D2,"cover.log")),
+	    [] = binary_to_term(Cover2),
+	    {ok,Cross} = file:read_file(filename:join(D1,"cross_cover.log")),
+	    [{cover_helper,{2,0,_}}] = binary_to_term(Cross),
+	    ok
+    end.
+
+
+run_test_server_tests(SuiteName, Skip, NCases, NFail, NExpected, NSucc,
 		      NUsrSkip, NAutoSkip, 
 		      NActualSkip, NActualFail, NActualSucc, Config) ->
+    run_test_server_tests(SuiteName, Skip, NCases, NFail, NExpected, NSucc,
+			  NUsrSkip, NAutoSkip,
+			  NActualSkip, NActualFail, NActualSucc, false, Config).
+
+run_test_server_tests(SuiteName, Skip, NCases, NFail, NExpected, NSucc,
+		      NUsrSkip, NAutoSkip,
+		      NActualSkip, NActualFail, NActualSucc, Cover, Config) ->
 
     WorkDir = proplists:get_value(work_dir, Config),
     ct:log("<a href=\"file://~s\">Test case log files</a>\n",
@@ -131,11 +189,17 @@ run_test_server_tests(SuiteName, NCases, NFail, NExpected, NSucc,
 
     Node = proplists:get_value(node, Config),
     {ok,_Pid} = rpc:call(Node,test_server_ctrl, start, []),
+    case Cover of
+	false ->
+	    ok;
+	_ ->
+	    rpc:call(Node,test_server_ctrl,cover,[Cover,details])
+    end,
     rpc:call(Node,
 	     test_server_ctrl,add_dir_with_skip,
 	     [SuiteName, 
 	      [proplists:get_value(data_dir,Config)],SuiteName,
-	      [{test_server_SUITE,skip_case7,"SKIPPED!"}]]),
+	      Skip]),
 
     until(fun() ->
 		  rpc:call(Node,test_server_ctrl,jobs,[]) =:= []
diff --git a/lib/test_server/test/test_server_SUITE_data/Makefile.src b/lib/test_server/test/test_server_SUITE_data/Makefile.src
index ec8ddd78b0..c770627f04 100644
--- a/lib/test_server/test/test_server_SUITE_data/Makefile.src
+++ b/lib/test_server/test/test_server_SUITE_data/Makefile.src
@@ -5,4 +5,6 @@ all:
 	erlc test_server_shuffle01_SUITE.erl
 	erlc test_server_conf02_SUITE.erl
 	erlc test_server_skip_SUITE.erl
-	erlc test_server_break_SUITE.erl
\ No newline at end of file
+	erlc test_server_break_SUITE.erl
+	erlc test_server_cover_SUITE.erl
+	erlc +debug_info test_server_cover_SUITE_data/cover_helper.erl
\ No newline at end of file
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_break_SUITE.erl b/lib/test_server/test/test_server_SUITE_data/test_server_break_SUITE.erl
index 70e30a3334..d9f009679a 100644
--- a/lib/test_server/test/test_server_SUITE_data/test_server_break_SUITE.erl
+++ b/lib/test_server/test/test_server_SUITE_data/test_server_break_SUITE.erl
@@ -41,7 +41,7 @@ init_per_suite(Config) ->
     spawn(fun break_and_continue_sup/0),
     Config.
 
-end_per_suite(Config) ->
+end_per_suite(_Config) ->
     ok.
 
 init_per_testcase(Case,Config) when Case==break_in_init_tc ->
@@ -90,19 +90,19 @@ break_in_end_tc_after_fail(Config) when is_list(Config) ->
 break_in_end_tc_after_abort(Config) when is_list(Config) ->
     ?t:adjusted_sleep(2000). % will cause a timetrap timeout
 
-%%%-----------------------------------------------------------------
-%%% Internal functions
-
 %% This test case checks that all breaks in previous test cases was
 %% also continued, and that the break lasted as long as expected.
 %% The reason for this is that some of the breaks above are in
 %% end_per_testcase, and failures there will only produce a warning,
 %% not an error - so this is to catch the error for real.
-check_all_breaks(Config) ->
+check_all_breaks(Config) when is_list(Config) ->
     break_and_continue_sup ! {done,self()},
     receive {Breaks,Continued} ->
 	    check_all_breaks(Breaks,Continued)
     end.
+%%%-----------------------------------------------------------------
+%%% Internal functions
+
 
 check_all_breaks([{From,Case,T,Start}|Breaks],[{From,End}|Continued]) ->
     Diff = timer:now_diff(End,Start),
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_cover_SUITE.erl b/lib/test_server/test/test_server_SUITE_data/test_server_cover_SUITE.erl
new file mode 100644
index 0000000000..b1ae70a302
--- /dev/null
+++ b/lib/test_server/test/test_server_SUITE_data/test_server_cover_SUITE.erl
@@ -0,0 +1,58 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2012. 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%
+%%
+-module(test_server_cover_SUITE).
+
+-export([all/1, init_per_suite/1, end_per_suite/1]).
+-export([init_per_testcase/2, end_per_testcase/2]).
+-export([tc1/1, tc2/1]).
+
+-include_lib("test_server/include/test_server.hrl").
+
+all(suite) ->
+    [tc1,tc2].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_testcase(_Case,Config) ->
+    Dog = ?t:timetrap({minutes,10}),
+    [{watchdog, Dog}|Config].
+
+end_per_testcase(_Case,Config) ->
+    Dog=?config(watchdog, Config),
+    ?t:timetrap_cancel(Dog),
+    ok.
+
+
+%%%-----------------------------------------------------------------
+%%% Test cases
+tc1(Config) when is_list(Config) ->
+    cover_helper:foo(),
+    ok.
+
+tc2(Config) when is_list(Config) ->
+    cover_helper:bar(),
+    ok.
+
+%%%-----------------------------------------------------------------
+%%% Internal functions
+
diff --git a/lib/test_server/test/test_server_SUITE_data/test_server_cover_SUITE_data/cover_helper.erl b/lib/test_server/test/test_server_SUITE_data/test_server_cover_SUITE_data/cover_helper.erl
new file mode 100644
index 0000000000..6c74eb4e8a
--- /dev/null
+++ b/lib/test_server/test/test_server_SUITE_data/test_server_cover_SUITE_data/cover_helper.erl
@@ -0,0 +1,4 @@
+-module(cover_helper).
+-compile(export_all).
+foo() -> ok.
+bar() -> ok.