From 7e554d06978ac52a4e56b48f67819af356a3279b Mon Sep 17 00:00:00 2001
From: alisdair sullivan <alisdairsullivan@yahoo.ca>
Date: Sat, 27 Aug 2016 13:22:41 -0700
Subject: reset accumulated coverdata on writing out to disk. this prevents
 provider chains like `eunit, ct, proper` from misreporting cover stats from
 providers later in the sequence

---
 test/rebar_cover_SUITE.erl | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/test/rebar_cover_SUITE.erl b/test/rebar_cover_SUITE.erl
index 1289f19..d66ec6f 100644
--- a/test/rebar_cover_SUITE.erl
+++ b/test/rebar_cover_SUITE.erl
@@ -13,7 +13,8 @@
          index_written/1,
          flag_verbose/1,
          config_verbose/1,
-         excl_mods/1]).
+         excl_mods/1,
+         coverdata_is_reset_on_write/1]).
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("eunit/include/eunit.hrl").
@@ -37,7 +38,7 @@ all() ->
      root_extra_src_dirs,
      index_written,
      flag_verbose, config_verbose,
-     excl_mods].
+     excl_mods, coverdata_is_reset_on_write].
 
 flag_coverdata_written(Config) ->
     AppDir = ?config(apps, Config),
@@ -232,3 +233,19 @@ excl_mods(Config) ->
 
     {file, _} = cover:is_compiled(Mod1),
     false = cover:is_compiled(Mod2).
+
+coverdata_is_reset_on_write(Config) ->
+    AppDir = ?config(apps, Config),
+
+    Name = rebar_test_utils:create_random_name("coverdata_is_reset_on_write_"),
+    Vsn = rebar_test_utils:create_random_vsn(),
+    rebar_test_utils:create_eunit_app(AppDir, Name, Vsn, [kernel, stdlib]),
+
+    RebarConfig = [{erl_opts, [{d, some_define}]}, {cover_enabled, true}],
+    rebar_test_utils:run_and_check(Config,
+                                   RebarConfig,
+                                   ["eunit"],
+                                   {ok, [{app, Name}]}),
+
+    {result, Ok, []} = cover:analyse(),
+    [] = lists:filter(fun({_, {0,_}}) -> false; (_) -> true end, Ok).
-- 
cgit v1.1


From 5ef4b7bcbe026852eb42e10ccc6f75b8e8854a15 Mon Sep 17 00:00:00 2001
From: alisdair sullivan <alisdairsullivan@yahoo.ca>
Date: Sat, 27 Aug 2016 13:33:57 -0700
Subject: use `cover:analyse(cover:modules())` for tests instead of
 `cover:analyse()`

`cover:analyse/0` didn't exist pre-otp18
---
 test/rebar_cover_SUITE.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/rebar_cover_SUITE.erl b/test/rebar_cover_SUITE.erl
index d66ec6f..84723ff 100644
--- a/test/rebar_cover_SUITE.erl
+++ b/test/rebar_cover_SUITE.erl
@@ -247,5 +247,5 @@ coverdata_is_reset_on_write(Config) ->
                                    ["eunit"],
                                    {ok, [{app, Name}]}),
 
-    {result, Ok, []} = cover:analyse(),
+    {result, Ok, []} = cover:analyse(cover:modules()),
     [] = lists:filter(fun({_, {0,_}}) -> false; (_) -> true end, Ok).
-- 
cgit v1.1


From 3beeec9db0880c5e9f57a427796d9d9af9ffa46d Mon Sep 17 00:00:00 2001
From: alisdair sullivan <alisdairsullivan@yahoo.ca>
Date: Sat, 27 Aug 2016 13:44:33 -0700
Subject: r15 proof cover tests``

---
 test/rebar_cover_SUITE.erl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/rebar_cover_SUITE.erl b/test/rebar_cover_SUITE.erl
index 84723ff..4192f4a 100644
--- a/test/rebar_cover_SUITE.erl
+++ b/test/rebar_cover_SUITE.erl
@@ -247,5 +247,6 @@ coverdata_is_reset_on_write(Config) ->
                                    ["eunit"],
                                    {ok, [{app, Name}]}),
 
-    {result, Ok, []} = cover:analyse(cover:modules()),
+    Res = lists:map(fun(M) -> cover:analyse(M) end, cover:modules()),
+    Ok = lists:foldl(fun({ok, R}, Acc) -> R ++ Acc end, [], Res),
     [] = lists:filter(fun({_, {0,_}}) -> false; (_) -> true end, Ok).
-- 
cgit v1.1