diff options
| -rwxr-xr-x | bootstrap | 2 | ||||
| -rw-r--r-- | src/rebar_file_utils.erl | 11 | ||||
| -rw-r--r-- | test/rebar_file_utils_SUITE.erl | 12 |
3 files changed, 19 insertions, 6 deletions
@@ -24,7 +24,7 @@ main(_) -> bootstrap_rebar3(), %% Build rebar.app from rebar.app.src - {ok, App} = rebar_app_info:new(rebar, "3.3.0", filename:absname("_build/default/lib/rebar/")), + {ok, App} = rebar_app_info:new(rebar, "3.3.1", filename:absname("_build/default/lib/rebar/")), rebar_otp_app:compile(rebar_state:new(), App), %% Because we are compiling files that are loaded already we want to silence diff --git a/src/rebar_file_utils.erl b/src/rebar_file_utils.erl index 104c047..437780d 100644 --- a/src/rebar_file_utils.erl +++ b/src/rebar_file_utils.erl @@ -171,9 +171,14 @@ mv(Source, Dest) -> {unix, _} -> EscSource = rebar_utils:escape_chars(Source), EscDest = rebar_utils:escape_chars(Dest), - {ok, []} = rebar_utils:sh(?FMT("mv ~s ~s", [EscSource, EscDest]), - [{use_stdout, false}, abort_on_error]), - ok; + case rebar_utils:sh(?FMT("mv ~s ~s", [EscSource, EscDest]), + [{use_stdout, false}, abort_on_error]) of + {ok, []} -> + ok; + {ok, Warning} -> + ?WARN("mv: ~p", [Warning]), + ok + end; {win32, _} -> Cmd = case filelib:is_dir(Source) of true -> diff --git a/test/rebar_file_utils_SUITE.erl b/test/rebar_file_utils_SUITE.erl index a44a06d..7285e13 100644 --- a/test/rebar_file_utils_SUITE.erl +++ b/test/rebar_file_utils_SUITE.erl @@ -14,7 +14,8 @@ path_from_ancestor/1, canonical_path/1, resolve_link/1, - split_dirname/1]). + split_dirname/1, + mv_warning_is_ignored/1]). -include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). @@ -27,7 +28,8 @@ all() -> path_from_ancestor, canonical_path, resolve_link, - split_dirname]. + split_dirname, + mv_warning_is_ignored]. groups() -> [{tmpdir, [], [raw_tmpdir, empty_tmpdir, simple_tmpdir, multi_tmpdir]}, @@ -135,3 +137,9 @@ split_dirname(_Config) -> ?assertEqual({".", "foo"}, rebar_file_utils:split_dirname("foo")), ?assertEqual({"/foo", "bar"}, rebar_file_utils:split_dirname("/foo/bar")), ?assertEqual({"foo", "bar"}, rebar_file_utils:split_dirname("foo/bar")). + +mv_warning_is_ignored(_Config) -> + meck:new(rebar_utils, [passthrough]), + meck:expect(rebar_utils, sh, fun("mv ding dong", _) -> {ok, "Warning"} end), + ok = rebar_file_utils:mv("ding", "dong"), + meck:unload(rebar_utils). |