瀏覽代碼

ct: compile tests from test dir to outdir instead of compiling copies

pull/342/head
Tristan Sloughter 10 年之前
父節點
當前提交
5999ef1c96
共有 1 個檔案被更改,包括 6 行新增6 行删除
  1. +6
    -6
      src/rebar_prv_common_test.erl

+ 6
- 6
src/rebar_prv_common_test.erl 查看文件

@ -242,7 +242,7 @@ copy_and_compile_test_suites(State, Opts) ->
Dirs = find_suite_dirs(AllSuites),
lists:foreach(fun(S) ->
NewPath = copy(State, S),
compile_dir(State, NewPath)
compile_dir(State, S, NewPath)
end, Dirs),
NewSuites = lists:map(fun(S) -> retarget_path(State, S) end, AllSuites),
[{suite, NewSuites}|lists:keydelete(suite, 1, Opts)]
@ -254,12 +254,12 @@ copy_and_compile_test_dirs(State, Opts) ->
%% dir is a single directory
Dir when is_list(Dir), is_integer(hd(Dir)) ->
NewPath = copy(State, Dir),
[{dir, compile_dir(State, NewPath)}|lists:keydelete(dir, 1, Opts)];
[{dir, compile_dir(State, Dir, NewPath)}|lists:keydelete(dir, 1, Opts)];
%% dir is a list of directories
Dirs when is_list(Dirs) ->
NewDirs = lists:map(fun(Dir) ->
NewPath = copy(State, Dir),
compile_dir(State, NewPath)
compile_dir(State, Dir, NewPath)
end, Dirs),
[{dir, NewDirs}|lists:keydelete(dir, 1, Opts)]
end.
@ -294,11 +294,11 @@ copy(State, Target) ->
NewTarget
end.
compile_dir(State, Dir) ->
compile_dir(State, Dir, OutDir) ->
NewState = replace_src_dirs(State, [Dir]),
ok = rebar_erlc_compiler:compile(NewState, rebar_dir:base_dir(State), Dir),
ok = rebar_erlc_compiler:compile(NewState, rebar_dir:base_dir(State), OutDir),
ok = maybe_cover_compile(State, Dir),
Dir.
OutDir.
retarget_path(State, Path) ->
ProjectApps = rebar_state:project_apps(State),

Loading…
取消
儲存