summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralisdair sullivan <alisdairsullivan@yahoo.ca>2015-03-03 10:18:49 -0800
committeralisdair sullivan <alisdairsullivan@yahoo.ca>2015-03-03 10:18:49 -0800
commit993a9efa58e68799ac84f7b2b02eac6bc0fb5453 (patch)
treea3f9bec26143c9f7b9d108175c3e00a84217b608
parentf161cd90c6033bb20f04473d10a2d963c4425424 (diff)
move `_logs` and `_cover` to `_build` dir
-rw-r--r--src/rebar_prv_common_test.erl4
-rw-r--r--src/rebar_prv_cover.erl2
-rw-r--r--test/rebar_cover_SUITE.erl10
3 files changed, 8 insertions, 8 deletions
diff --git a/src/rebar_prv_common_test.erl b/src/rebar_prv_common_test.erl
index 032a8a6..18969b3 100644
--- a/src/rebar_prv_common_test.erl
+++ b/src/rebar_prv_common_test.erl
@@ -74,8 +74,8 @@ run_test(CTOpts, false) ->
end),
receive Result -> handle_quiet_results(CTOpts, Result) end.
-ct_opts(State) ->
- DefaultLogsDir = filename:join([rebar_state:dir(State), "_logs"]),
+ct_opts(_State) ->
+ DefaultLogsDir = filename:join(["_build", "_logs"]),
[{dir, undefined, "dir", string, help(dir)}, %% comma-seperated list
{suite, undefined, "suite", string, help(suite)}, %% comma-seperated list
{group, undefined, "group", string, help(group)}, %% comma-seperated list
diff --git a/src/rebar_prv_cover.erl b/src/rebar_prv_cover.erl
index 765e2ac..812176f 100644
--- a/src/rebar_prv_cover.erl
+++ b/src/rebar_prv_cover.erl
@@ -333,7 +333,7 @@ verbose(State) ->
end.
cover_dir(State) ->
- rebar_state:get(State, cover_data_dir, "_cover").
+ rebar_state:get(State, cover_data_dir, filename:join(["_build", "_cover"])).
cover_opts(_State) ->
[{reset, $r, "reset", boolean, help(reset)},
diff --git a/test/rebar_cover_SUITE.erl b/test/rebar_cover_SUITE.erl
index c719982..dba9f59 100644
--- a/test/rebar_cover_SUITE.erl
+++ b/test/rebar_cover_SUITE.erl
@@ -47,7 +47,7 @@ flag_coverdata_written(Config) ->
["eunit", "--cover"],
{ok, [{app, Name}]}),
- true = filelib:is_file(filename:join(["_cover", "eunit.coverdata"])).
+ true = filelib:is_file(filename:join(["_build", "_cover", "eunit.coverdata"])).
config_coverdata_written(Config) ->
AppDir = ?config(apps, Config),
@@ -62,7 +62,7 @@ config_coverdata_written(Config) ->
["eunit"],
{ok, [{app, Name}]}),
- true = filelib:is_file(filename:join(["_cover", "eunit.coverdata"])).
+ true = filelib:is_file(filename:join(["_build", "_cover", "eunit.coverdata"])).
index_written(Config) ->
AppDir = ?config(apps, Config),
@@ -77,7 +77,7 @@ index_written(Config) ->
["do", "eunit", "--cover", ",", "cover"],
{ok, [{app, Name}]}),
- true = filelib:is_file(filename:join(["_cover", "index.html"])).
+ true = filelib:is_file(filename:join(["_build", "_cover", "index.html"])).
config_alt_coverdir(Config) ->
AppDir = ?config(apps, Config),
@@ -109,7 +109,7 @@ flag_verbose(Config) ->
["do", "eunit", "--cover", ",", "cover", "--verbose"],
{ok, [{app, Name}]}),
- true = filelib:is_file(filename:join(["_cover", "index.html"])).
+ true = filelib:is_file(filename:join(["_build", "_cover", "index.html"])).
config_verbose(Config) ->
AppDir = ?config(apps, Config),
@@ -124,4 +124,4 @@ config_verbose(Config) ->
["do", "eunit", "--cover", ",", "cover"],
{ok, [{app, Name}]}),
- true = filelib:is_file(filename:join(["_cover", "index.html"])).
+ true = filelib:is_file(filename:join(["_build", "_cover", "index.html"])).