From e7abae84c04a33ed86780465d3c9d9b566e0ddad Mon Sep 17 00:00:00 2001 From: alisdair sullivan Date: Sat, 30 Jan 2016 14:58:09 -0800 Subject: don't strip the project apps when running `ct` with just a root suite specified this ensures the project apps are compiled to `lib/` instead of `extras/` --- src/rebar_prv_common_test.erl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/rebar_prv_common_test.erl b/src/rebar_prv_common_test.erl index 1136e08..f6fee9a 100644 --- a/src/rebar_prv_common_test.erl +++ b/src/rebar_prv_common_test.erl @@ -281,7 +281,8 @@ inject_ct_state(State, [App|Rest], Acc) -> inject_ct_state(State, [], Acc) -> case inject(rebar_state:opts(State), State) of {error, _} = Error -> Error; - NewOpts -> {ok, {rebar_state:opts(State, NewOpts), lists:reverse(Acc)}} + NewOpts -> + {ok, {rebar_state:opts(State, NewOpts), lists:reverse(Acc)}} end. opts(Opts, Key, Default) -> @@ -385,7 +386,7 @@ maybe_inject_test_dir(State, AppAcc, [App|Rest], Dir) -> ExtrasDir = filename:join([rebar_dir:base_dir(State), "extras", RelAppDir]), ok = copy_bare_suites(Dir, ExtrasDir), Opts = inject_test_dir(rebar_state:opts(State), ExtrasDir), - {rebar_state:opts(State, Opts), AppAcc}; + {rebar_state:opts(State, Opts), AppAcc ++ [App]}; {ok, Path} -> Opts = inject_test_dir(rebar_app_info:opts(App), Path), {State, AppAcc ++ [rebar_app_info:opts(App, Opts)] ++ Rest}; -- cgit v1.1