summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Widgren <daniel.widgren@gmail.com>2015-06-26 22:39:15 +0200
committerDaniel Widgren <daniel.widgren@gmail.com>2015-06-26 22:39:15 +0200
commitebfdbc695ef8bf615ab28fba1d8c22752f21e1cd (patch)
tree8d526eb0ab46d05e1a329b133280b3d16be9aac5
parent44272e23b641a016b74edf0cb9849b0656e8f726 (diff)
Fixed review comments
-rw-r--r--src/rebar_file_utils.erl4
-rw-r--r--src/rebar_prv_common_test.erl2
-rw-r--r--test/rebar_test_utils.erl20
3 files changed, 4 insertions, 22 deletions
diff --git a/src/rebar_file_utils.erl b/src/rebar_file_utils.erl
index 735ab49..3fc5698 100644
--- a/src/rebar_file_utils.erl
+++ b/src/rebar_file_utils.erl
@@ -83,7 +83,7 @@ symlink_or_copy(Source, Target) ->
true ->
win32_symlink(S, T);
false ->
- ok
+ cp_r([S], T)
end;
_ ->
case filelib:is_dir(Target) of
@@ -104,7 +104,7 @@ win32_symlink(Source, Target) ->
true -> ok;
false ->
{error, lists:flatten(
- io_lib:format("Failed to sumlink ~s to ~s~n",
+ io_lib:format("Failed to symlink ~s to ~s~n",
[Source, Target]))}
end.
diff --git a/src/rebar_prv_common_test.erl b/src/rebar_prv_common_test.erl
index f76fdf5..9128064 100644
--- a/src/rebar_prv_common_test.erl
+++ b/src/rebar_prv_common_test.erl
@@ -354,7 +354,7 @@ remove_links(Path) ->
true ->
file:delete(Path);
false ->
- ec_file:is_dir(Path) andalso
+ IsDir andalso
lists:foreach(fun(ChildPath) ->
remove_links(ChildPath)
end, sub_dirs(Path))
diff --git a/test/rebar_test_utils.erl b/test/rebar_test_utils.erl
index 639a293..0c65cb2 100644
--- a/test/rebar_test_utils.erl
+++ b/test/rebar_test_utils.erl
@@ -215,7 +215,6 @@ check_results(AppDir, Expected) ->
?assertNotEqual(false, lists:keyfind(Name, 1, DepsNames))
; ({dep, Name, Vsn}) ->
ct:pal("Dep Name: ~p, Vsn: ~p", [Name, Vsn]),
- ct:pal("DepNames: ~p~n", [DepsNames]),
case lists:keyfind(Name, 1, DepsNames) of
false ->
error({dep_not_found, Name});
@@ -275,28 +274,11 @@ check_results(AppDir, Expected) ->
LibDir = filename:join([ReleaseDir, Name, "lib"]),
{ok, RelLibs} = file:list_dir(LibDir),
- ct:pal("RelLibs: ~p~n", [RelLibs]),
IsSymLinkFun =
fun(X) ->
ec_file:is_symlink(filename:join(LibDir, X))
end,
- IsDirFun =
- fun(X) ->
- filelib:is_dir(filename:join([LibDir, X]))
- end,
- DevMode =
- case os:type() of
- {unix, _} ->
- lists:all(IsSymLinkFun, RelLibs);
- {win32, _} ->
- Bool = lists:all(IsDirFun, RelLibs),
- case ExpectedDevMode of
- true ->
- Bool;
- false ->
- not Bool
- end
- end,
+ DevMode = lists:all(IsSymLinkFun, RelLibs),
?assertEqual(ExpectedDevMode, DevMode),
%% throws not_found if it doesn't exist