diff options
| author | Tristan Sloughter <tristan.sloughter@gmail.com> | 2015-03-03 14:23:59 -0600 |
|---|---|---|
| committer | Tristan Sloughter <tristan.sloughter@gmail.com> | 2015-03-03 14:23:59 -0600 |
| commit | c43641654fe808dd4e6b49b9a770493db1c4e96b (patch) | |
| tree | 3917bc4c09bb8f44961d0f52aae0e37a3227723f | |
| parent | 7480b06e625d7a215705f4d8a21030fc1615af42 (diff) | |
| parent | 434c6628162750fbe6074096260d9a30053456c8 (diff) | |
Merge pull request #207 from talentdeficit/move_logs_and_cover
move `_logs` and `_cover` to `_build` dir
| -rw-r--r-- | src/rebar_prv_common_test.erl | 4 | ||||
| -rw-r--r-- | src/rebar_prv_cover.erl | 2 | ||||
| -rw-r--r-- | test/rebar_cover_SUITE.erl | 10 |
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..b12ffde 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..09d3861 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..f3c3248 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"])). |