summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Smith <dizzyd@dizzyd.com>2010-04-23 10:10:11 -0600
committerDave Smith <dizzyd@dizzyd.com>2010-04-23 10:10:11 -0600
commitdbfd2a08cdd3ae7f22bb9c120dff9871d9ec9a36 (patch)
treedc9795b71a016b83f463a8c0eea22530252b83b1
parent0add7acdbfa368d33a821789470228895561fbfc (diff)
parent99bf0f3918e95edb4dfb06f0ccc30a1b4d875f33 (diff)
Merging w/ mainline
-rw-r--r--src/rebar_eunit.erl5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/rebar_eunit.erl b/src/rebar_eunit.erl
index 2f3da35..1cfd14d 100644
--- a/src/rebar_eunit.erl
+++ b/src/rebar_eunit.erl
@@ -74,7 +74,7 @@ eunit(Config, _File) ->
%% with that scan and causes any cover compilation info to be lost.
%% Filter out "*_tests" modules so eunit won't doubly run them and
%% so cover only calculates coverage on production code.
- BeamFiles = [N || N <- rebar_utils:beams(?EUNIT_DIR),
+ BeamFiles = [N || N <- rebar_utils:beams(?EUNIT_DIR),
string:str(N, "_tests.beam") =:= 0],
Modules = [rebar_utils:beam_to_mod(?EUNIT_DIR, N) || N <- BeamFiles],
@@ -99,8 +99,7 @@ clean(_Config, _File) ->
%% ===================================================================
eunit_dir() ->
- {ok, Cwd} = file:get_cwd(),
- filename:join(Cwd, ?EUNIT_DIR).
+ filename:join(rebar_utils:get_cwd(), ?EUNIT_DIR).
perform_eunit(Config, Modules) ->
%% suite defined, so only specify the module that relates to the