From 166adf40295641204592fbb97f5e2d6b5dbe806e Mon Sep 17 00:00:00 2001 From: Dave Smith Date: Tue, 8 Jun 2010 16:07:20 -0600 Subject: Update retest w/ better handling of multi-statement shell commands; update tdeps1_rt to use it --HG-- extra : rebase_source : 010907d47b360288825cb9c841d62450700be225 --- inttest/tdeps1/tdeps1_rt.erl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'inttest/tdeps1') 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. -- cgit v1.1