From 14cb6803e0a0742613cd4e476c5db0e5a1b134e7 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Fri, 28 Nov 2014 22:32:20 -0600 Subject: wip: profiles --- src/rebar_prv_common_test.erl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/rebar_prv_common_test.erl') diff --git a/src/rebar_prv_common_test.erl b/src/rebar_prv_common_test.erl index 59f5565..d14144f 100644 --- a/src/rebar_prv_common_test.erl +++ b/src/rebar_prv_common_test.erl @@ -12,7 +12,7 @@ -include("rebar.hrl"). -define(PROVIDER, ct). --define(DEPS, [test_deps, compile]). +-define(DEPS, [{install_deps, default}, compile]). %% =================================================================== %% Public API @@ -27,7 +27,8 @@ init(State) -> {example, "rebar ct"}, {short_desc, "Run Common Tests"}, {desc, ""}, - {opts, ct_opts(State)}]), + {opts, ct_opts(State)}, + {profile, test}]), State1 = rebar_state:add_provider(State, Provider), {ok, State1}. @@ -36,8 +37,7 @@ do(State) -> {Opts, _} = rebar_state:command_parsed_args(State), Opts1 = transform_opts(Opts), ok = create_dirs(Opts1), - expand_test_deps(filename:absname(rebar_state:get(State, test_deps_dir, - ?DEFAULT_TEST_DEPS_DIR))), + expand_test_deps(filename:join(rebar_utils:profile_dir(State), ?DEFAULT_DEPS_DIR)), case ct:run_test(Opts1) of {_, 0, _} -> {ok, State}; {_, FailedCount, _} -> {error, {?MODULE, {failures_running_tests, -- cgit v1.1 From 8e5c916cb6e93b484278e7463af3e7b07fe6db07 Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Mon, 1 Dec 2014 17:54:47 -0600 Subject: move dir functions from utils to new module rebar_dir --- src/rebar_prv_common_test.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/rebar_prv_common_test.erl') diff --git a/src/rebar_prv_common_test.erl b/src/rebar_prv_common_test.erl index d14144f..3d64517 100644 --- a/src/rebar_prv_common_test.erl +++ b/src/rebar_prv_common_test.erl @@ -37,7 +37,7 @@ do(State) -> {Opts, _} = rebar_state:command_parsed_args(State), Opts1 = transform_opts(Opts), ok = create_dirs(Opts1), - expand_test_deps(filename:join(rebar_utils:profile_dir(State), ?DEFAULT_DEPS_DIR)), + expand_test_deps(filename:join(rebar_dir:profile_dir(State), ?DEFAULT_DEPS_DIR)), case ct:run_test(Opts1) of {_, 0, _} -> {ok, State}; {_, FailedCount, _} -> {error, {?MODULE, {failures_running_tests, -- cgit v1.1