Update retest w/ better handling of multi-statement shell commands; update tdeps1_rt to use it

--HG--
extra : rebase_source : 010907d47b360288825cb9c841d62450700be225

2 files changed, 6 insertions, 5 deletions

diff --git a/inttest/retest b/inttest/retest
index 7f8012c..85c9f1e 100755
--- a/inttest/retest
+++ b/inttest/retest
diff --git a/inttest/tdeps1/tdeps1_rt.erl b/inttest/tdeps1/tdeps1_rt.erl
index 8005741..5b531bc 100644
--- a/inttest/tdeps1/tdeps1_rt.erl
+++ b/inttest/tdeps1/tdeps1_rt.erl
@@ -14,7 +14,7 @@ files() ->
      {copy, "../../rebar", "rebar"},
 
      %% B application
-     {create, "repo/b/ebin/b.app", app(b)},
+     {create, "repo/b/src/b.app.src", app(b)},
      {copy, "b.rebar.config", "repo/b/rebar.config"},
      {copy, "b.hrl", "repo/b/include/b.hrl"},
 
@@ -26,11 +26,12 @@ files() ->
 run(_Dir) ->
     %% Initialize the b/c apps as mercurial repos so that dependencies pull
     %% properly
-    HgCmd = "hg init && hg add && hg commit -m 'Initial commit'",
-    retest_log:log(debug, "~s\n", [os:cmd("(cd repo/b && " ++ HgCmd ++ ")")]),
-    retest_log:log(debug, "~s\n", [os:cmd("(cd repo/c && " ++ HgCmd ++ ")")]),
+    HgCmd = "/bin/sh -c \"hg init && hg add && hg commit -m 'Initial commit'\"",
+    {ok, _} = retest_sh:run(HgCmd, [{dir, "repo/b"}]),
+    {ok, _} = retest_sh:run(HgCmd, [{dir, "repo/c"}]),
 
-    retest_log:log(debug, "~s\n", [os:cmd("./rebar get-deps compile")]),
+
+    {ok, _} = retest_sh:run("./rebar -v get-deps compile", []),
     ok.