diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rebar_git_resource.erl | 2 | ||||
| -rw-r--r-- | src/rebar_prv_common_test.erl | 5 | ||||
| -rw-r--r-- | src/rebar_prv_test_deps.erl | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/rebar_git_resource.erl b/src/rebar_git_resource.erl index 6b655de..1c4ece7 100644 --- a/src/rebar_git_resource.erl +++ b/src/rebar_git_resource.erl @@ -84,7 +84,7 @@ download(Dir, {git, Url, Rev}) -> rebar_utils:sh(?FMT("git checkout -q ~s", [Rev]), [{cd, Dir}]). make_vsn(Dir) -> - Cwd = file:get_cwd(), + {ok, Cwd} = file:get_cwd(), try ok = file:set_cwd(Dir), {Vsn, RawRef, RawCount} = collect_default_refcount(), diff --git a/src/rebar_prv_common_test.erl b/src/rebar_prv_common_test.erl index b439977..ce63192 100644 --- a/src/rebar_prv_common_test.erl +++ b/src/rebar_prv_common_test.erl @@ -34,6 +34,7 @@ init(State) -> -spec do(rebar_state:t()) -> {ok, rebar_state:t()}. do(State) -> Opts = build_options(State), + expand_test_deps(filename:absname(rebar_state:get(State, test_deps_dir, ?DEFAULT_TEST_DEPS_DIR))), ct:run_test(Opts), {ok, State}. @@ -41,6 +42,10 @@ do(State) -> format_error(Reason, State) -> {io_lib:format("~p", [Reason]), State}. +expand_test_deps(Dir) -> + Apps = filelib:wildcard(filename:join([Dir, "*", "ebin"])), + ok = code:add_pathsa(Apps). + ct_opts(State) -> DefaultTestDir = filename:join([rebar_state:dir(State), "test"]), DefaultLogsDir = filename:join([rebar_state:dir(State), "logs"]), diff --git a/src/rebar_prv_test_deps.erl b/src/rebar_prv_test_deps.erl index a51f635..c9cd127 100644 --- a/src/rebar_prv_test_deps.erl +++ b/src/rebar_prv_test_deps.erl @@ -11,8 +11,6 @@ -define(PROVIDER, test_deps). -define(DEPS, []). --define(DEFAULT_TEST_DEPS_DIR, "_tdeps"). - %% =================================================================== %% Public API %% =================================================================== |