summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoralisdair sullivan <alisdairsullivan@yahoo.ca>2015-01-15 09:48:18 -0800
committeralisdair sullivan <alisdairsullivan@yahoo.ca>2015-01-16 06:44:41 -0800
commit00e03d70efa697bcd6cba53d62efc461035a4d82 (patch)
treeb299f2096ce671589ee8b12d2a28f610fde90987 /src
parent0b21243eaed49500bcb27654d394aa4f110bb723 (diff)
use new `rebar_file_utils` functions in `eunit` and `ct` providers
Diffstat (limited to 'src')
-rw-r--r--src/rebar_prv_common_test.erl12
-rw-r--r--src/rebar_prv_eunit.erl12
2 files changed, 4 insertions, 20 deletions
diff --git a/src/rebar_prv_common_test.erl b/src/rebar_prv_common_test.erl
index 72cb0b0..9e17f38 100644
--- a/src/rebar_prv_common_test.erl
+++ b/src/rebar_prv_common_test.erl
@@ -182,19 +182,11 @@ split_ct_dirs(State, RawOpts) ->
{InDirs, OutDir}.
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]),
Project = filename:basename(rebar_state:dir(State)),
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.
transform_opts(Opts) ->
diff --git a/src/rebar_prv_eunit.erl b/src/rebar_prv_eunit.erl
index be554f3..a434fad 100644
--- a/src/rebar_prv_eunit.erl
+++ b/src/rebar_prv_eunit.erl
@@ -102,19 +102,11 @@ filter_checkouts([App|Rest], Acc) ->
end.
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]),
Project = filename:basename(rebar_state:dir(State)),
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.
test_state(State, TmpDir) ->