summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@lshift.net>2010-04-21 18:13:56 +0100
committerSimon MacMullen <simon@lshift.net>2010-04-21 18:13:56 +0100
commitac22f0645e59bc9256057626f84e0ebd3f2ff72f (patch)
tree680047967ae2df37d25277a9e65e8b759fb4e8d3
parent11848f3d18caaeb62c7b15ad5643d7088d95bb0f (diff)
downloadrabbitmq-server-ac22f0645e59bc9256057626f84e0ebd3f2ff72f.tar.gz
Roll secondary node coverage into "make start-cover"
-rw-r--r--Makefile7
-rw-r--r--src/rabbit_misc.erl6
2 files changed, 4 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index e058a6fa..99b0cb3a 100644
--- a/Makefile
+++ b/Makefile
@@ -166,13 +166,10 @@ stop-node:
# code coverage will be created for subdirectory "ebin" of COVER_DIR
COVER_DIR=.
-SECONDARY_NODENAME=hare
start-cover: all
- echo "cover:start(), rabbit_misc:enable_cover([\"$(COVER_DIR)\"])." | $(ERL_CALL)
-
-start-secondary-cover:
- echo "rabbit_misc:enable_cover_node(\"$(SECONDARY_NODENAME)\")." | $(ERL_CALL)
+ echo "rabbit_misc:start_cover([\"rabbit\", \"hare\"])." | $(ERL_CALL)
+ echo "rabbit_misc:enable_cover([\"$(COVER_DIR)\"])." | $(ERL_CALL)
stop-cover: all
echo "rabbit_misc:report_cover(), cover:stop()." | $(ERL_CALL)
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index d35c0a25..4cbc39a4 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -43,7 +43,7 @@
-export([r/3, r/2, r_arg/4, rs/1]).
-export([enable_cover/0, report_cover/0]).
-export([enable_cover/1, report_cover/1]).
--export([enable_cover_node/1]).
+-export([start_cover/1]).
-export([throw_on_error/2, with_exit_handler/2, filter_exit_map/2]).
-export([with_user/2, with_vhost/2, with_user_and_vhost/3]).
-export([execute_mnesia_transaction/1]).
@@ -230,9 +230,7 @@ enable_cover(Root) ->
_ -> ok
end.
-enable_cover_node(NodeS) ->
- Node = makenode(NodeS),
- {ok, _} = cover:start([Node]).
+start_cover(NodesS) -> {ok, _} = cover:start([makenode(N) || N <- NodesS]).
report_cover() ->
report_cover(".").