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

dgud · Mar 11, 2014 · 415d872 · 415d872
1 parent 9bb677e
commit 415d872
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/ebin/rebar.app b/ebin/rebar.app
@@ -92,9 +92,10 @@
                               ]}
                    ]},
          {recursive_cmds, [
-                           'get-deps',
                            'check-deps',
+                           'compile',
                            'delete-deps',
+                           'get-deps',
                            'list-deps',
                            'update-deps'
                           ]}

diff --git a/inttest/depplugins/depplugins_rt.erl b/inttest/depplugins/depplugins_rt.erl
@@ -39,7 +39,7 @@ files() ->
     ].
 
 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")),
 

diff --git a/inttest/tdeps1/tdeps1_rt.erl b/inttest/tdeps1/tdeps1_rt.erl
@@ -42,7 +42,7 @@ run(_Dir) ->
     apply_cmds(GitCmds, [{dir, "repo/c"}]),
 
     {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"),
     ok.

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

diff --git a/inttest/tdeps_update/tdeps_update_rt.erl b/inttest/tdeps_update/tdeps_update_rt.erl
@@ -123,7 +123,7 @@ run(_Dir) ->
     ok = apply_cmds(GitCmds++FCmds, [{dir, "repo/f"}]),
 
     {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"),
     {ok, _} = retest_sh:run("./rebar -v update-deps", []),
     {ok, _} = retest_sh:run("./rebar -v compile", []),