Przeglądaj źródła

use new `rebar_file_utils` functions in `eunit` and `ct` providers

pull/101/head
alisdair sullivan 10 lat temu
rodzic
commit
00e03d70ef
2 zmienionych plików z 4 dodań i 20 usunięć
  1. +2
    -10
      src/rebar_prv_common_test.erl
  2. +2
    -10
      src/rebar_prv_eunit.erl

+ 2
- 10
src/rebar_prv_common_test.erl Wyświetl plik

@ -182,19 +182,11 @@ split_ct_dirs(State, RawOpts) ->
{InDirs, OutDir}. {InDirs, OutDir}.
default_test_dir(State) -> default_test_dir(State) ->
Tmp = case erlang:system_info(system_architecture) of
"win32" ->
"./tmp";
_SysArch ->
"/tmp"
end,
Tmp = rebar_file_utils:system_tmpdir(),
Root = filename:join([rebar_state:dir(State), Tmp]), Root = filename:join([rebar_state:dir(State), Tmp]),
Project = filename:basename(rebar_state:dir(State)), Project = filename:basename(rebar_state:dir(State)),
OutDir = filename:join([Root, Project ++ "_rebar3_ct"]), OutDir = filename:join([Root, Project ++ "_rebar3_ct"]),
%% delete the directory if it exists so tests run with clean state
_ = ec_file:remove(OutDir, [recursive]),
%% recreate the directory
ok = filelib:ensure_dir(filename:join([OutDir, "dummy.beam"])),
ok = rebar_file_utils:reset_dir(OutDir),
OutDir. OutDir.
transform_opts(Opts) -> transform_opts(Opts) ->

+ 2
- 10
src/rebar_prv_eunit.erl Wyświetl plik

@ -102,19 +102,11 @@ filter_checkouts([App|Rest], Acc) ->
end. end.
default_test_dir(State) -> default_test_dir(State) ->
Tmp = case erlang:system_info(system_architecture) of
"win32" ->
"./tmp";
_SysArch ->
"/tmp"
end,
Tmp = rebar_file_utils:system_tmpdir(),
Root = filename:join([rebar_state:dir(State), Tmp]), Root = filename:join([rebar_state:dir(State), Tmp]),
Project = filename:basename(rebar_state:dir(State)), Project = filename:basename(rebar_state:dir(State)),
OutDir = filename:join([Root, Project ++ "_rebar3_eunit"]), OutDir = filename:join([Root, Project ++ "_rebar3_eunit"]),
%% delete the directory if it exists so tests run with clean state
_ = ec_file:remove(OutDir, [recursive]),
%% recreate the directory
ok = filelib:ensure_dir(filename:join([OutDir, "dummy.beam"])),
ok = rebar_file_utils:reset_dir(OutDir),
OutDir. OutDir.
test_state(State, TmpDir) -> test_state(State, TmpDir) ->

Ładowanie…
Anuluj
Zapisz