diff options
| -rw-r--r-- | src/rebar_prv_common_test.erl | 4 | ||||
| -rw-r--r-- | src/rebar_prv_cover.erl | 2 | ||||
| -rw-r--r-- | src/rebar_prv_dialyzer.erl | 9 | ||||
| -rw-r--r-- | test/rebar_cover_SUITE.erl | 10 |
4 files changed, 15 insertions, 10 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/src/rebar_prv_dialyzer.erl b/src/rebar_prv_dialyzer.erl index 24abc4f..9d2c10a 100644 --- a/src/rebar_prv_dialyzer.erl +++ b/src/rebar_prv_dialyzer.erl @@ -380,13 +380,18 @@ run_dialyzer(State, Opts) -> case proplists:get_bool(get_warnings, Opts) of true -> WarningsList = rebar_state:get(State, dialyzer_warnings, []), - Opts2 = [{warnings, WarningsList} | Opts], + Opts2 = [{warnings, WarningsList}, + {check_plt, false} | + Opts], {Unknowns, Warnings} = format_warnings(dialyzer:run(Opts2)), _ = [?CONSOLE("~s", [Unknown]) || Unknown <- Unknowns], _ = [?CONSOLE("~s", [Warning]) || Warning <- Warnings], {length(Warnings), State}; false -> - _ = dialyzer:run([{warnings, no_warnings()} | Opts]), + Opts2 = [{warnings, no_warnings()}, + {check_plt, false} | + Opts], + _ = dialyzer:run(Opts2), {0, State} end. 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"])). |