Keep compile recursive and update the tests to not pass -r to compile

This commit is contained in:
Jared Morrow 2014-03-11 21:23:16 +00:00
parent 9bb677ed99
commit 415d872730
5 changed files with 6 additions and 5 deletions

View file

@ -92,9 +92,10 @@
]} ]}
]}, ]},
{recursive_cmds, [ {recursive_cmds, [
'get-deps',
'check-deps', 'check-deps',
'compile',
'delete-deps', 'delete-deps',
'get-deps',
'list-deps', 'list-deps',
'update-deps' 'update-deps'
]} ]}

View file

@ -39,7 +39,7 @@ files() ->
]. ].
run(_Dir) -> run(_Dir) ->
?assertMatch({ok, _}, retest_sh:run("./rebar -r compile", [])), ?assertMatch({ok, _}, retest_sh:run("./rebar compile", [])),
?assertEqual(true, filelib:is_regular("base_dir_cwd_pre.compile")), ?assertEqual(true, filelib:is_regular("base_dir_cwd_pre.compile")),

View file

@ -42,7 +42,7 @@ run(_Dir) ->
apply_cmds(GitCmds, [{dir, "repo/c"}]), apply_cmds(GitCmds, [{dir, "repo/c"}]),
{ok, _} = retest_sh:run("./rebar get-deps", []), {ok, _} = retest_sh:run("./rebar get-deps", []),
{ok, _} = retest_sh:run("./rebar -r compile", []), {ok, _} = retest_sh:run("./rebar compile", []),
true = filelib:is_regular("ebin/a.beam"), true = filelib:is_regular("ebin/a.beam"),
ok. ok.

View file

@ -50,7 +50,7 @@ run(_Dir) ->
ok = apply_cmds(GitCmds, [{dir, "repo/c"}]), ok = apply_cmds(GitCmds, [{dir, "repo/c"}]),
{ok, _} = retest_sh:run("./rebar -v get-deps", []), {ok, _} = retest_sh:run("./rebar -v get-deps", []),
{ok, _} = retest_sh:run("./rebar -v -r compile", []), {ok, _} = retest_sh:run("./rebar -v compile", []),
ok. ok.
%% %%

View file

@ -123,7 +123,7 @@ run(_Dir) ->
ok = apply_cmds(GitCmds++FCmds, [{dir, "repo/f"}]), ok = apply_cmds(GitCmds++FCmds, [{dir, "repo/f"}]),
{ok, _} = retest_sh:run("./rebar -v get-deps", []), {ok, _} = retest_sh:run("./rebar -v get-deps", []),
{ok, _} = retest_sh:run("./rebar -v -r compile", []), {ok, _} = retest_sh:run("./rebar -v compile", []),
os:cmd("cp a2.rebar.config apps/a1/rebar.config"), os:cmd("cp a2.rebar.config apps/a1/rebar.config"),
{ok, _} = retest_sh:run("./rebar -v update-deps", []), {ok, _} = retest_sh:run("./rebar -v update-deps", []),
{ok, _} = retest_sh:run("./rebar -v compile", []), {ok, _} = retest_sh:run("./rebar -v compile", []),