From 440f0d7524d1908ed34b54395a88455b4673e93f Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sat, 28 Feb 2015 15:14:05 -0600 Subject: update compile call from common test provider with new outdir --- src/rebar_prv_common_test.erl | 3 ++- 1 file changed, 2 insertions(+), 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 b697d37..f1c1159 100644 --- a/src/rebar_prv_common_test.erl +++ b/src/rebar_prv_common_test.erl @@ -43,13 +43,14 @@ do(State) -> ?DEBUG("Compiling Common Test suites in: ~p", [OutDir]), lists:foreach(fun(App) -> AppDir = rebar_app_info:dir(App), + AppOutDir = rebar_app_info:out_dir(App), C = rebar_config:consult(AppDir), S = rebar_state:new(State, C, AppDir), %% combine `erl_first_files` and `common_test_first_files` and %% adjust compile opts to include `common_test_compile_opts` %% and `{src_dirs, "test"}` TestState = test_state(S, InDirs, OutDir), - ok = rebar_erlc_compiler:compile(TestState, AppDir) + ok = rebar_erlc_compiler:compile(TestState, AppDir, AppOutDir) end, TestApps), ok = maybe_compile_extra_tests(TestApps, State, InDirs, OutDir), Path = code:get_path(), -- cgit v1.1 From 0a8ee68042e209509e6357bebd2ee5936407802b Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Sun, 1 Mar 2015 09:39:13 -0600 Subject: fix compile/3 call in common_test provider --- 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 f1c1159..c3f9163 100644 --- a/src/rebar_prv_common_test.erl +++ b/src/rebar_prv_common_test.erl @@ -343,7 +343,7 @@ maybe_compile_extra_tests(TestApps, State, InDirs, OutDir) -> [{src_dirs, ["test"|InDirs]}] ++ lists:keydelete(src_dirs, 1, ErlOpts), TestState = first_files(rebar_state:set(State, erl_opts, TestOpts)), - rebar_erlc_compiler:compile(TestState, rebar_dir:get_cwd()); + rebar_erlc_compiler:compile(TestState, rebar_dir:get_cwd(), rebar_dir:get_cwd()); %% already compiled `./test` so do nothing _ -> ok end. -- cgit v1.1