diff options
Diffstat (limited to 'inttest/tdeps2/tdeps2_rt.erl')
| -rw-r--r-- | inttest/tdeps2/tdeps2_rt.erl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/inttest/tdeps2/tdeps2_rt.erl b/inttest/tdeps2/tdeps2_rt.erl index 97a24ce..a5665ad 100644 --- a/inttest/tdeps2/tdeps2_rt.erl +++ b/inttest/tdeps2/tdeps2_rt.erl @@ -4,10 +4,13 @@ -compile(export_all). +setup([Target]) -> + retest_utils:load_module(filename:join(Target, "inttest_utils.erl")), + ok. + %% Exercise transitive dependencies where there are multiple files %% depending on the same set of deps %% [A1, A2] -> B -> C ; A1 and A2 includes B.hrl which includes C.hrl - files() -> [ %% A1 application @@ -21,7 +24,6 @@ files() -> {template, "a.erl", "apps/a2/src/a2.erl", dict:from_list([{module, a2}])}, {copy, "root.rebar.config", "rebar.config"}, - {copy, "../../rebar", "rebar"}, %% B application {create, "repo/b/ebin/b.app", app(b, [])}, @@ -31,7 +33,7 @@ files() -> %% C application {create, "repo/c/ebin/c.app", app(c, [])}, {copy, "c.hrl", "repo/c/include/c.hrl"} - ]. + ] ++ inttest_utils:rebar_setup(). apply_cmds([], _Params) -> ok; @@ -47,7 +49,7 @@ run(_Dir) -> "git add -A", "git config user.email 'tdeps@example.com'", "git config user.name 'tdeps'", - "git commit -a -m 'Initial Commit'"], + "git commit -a -m \"Initial Commit\""], ok = apply_cmds(GitCmds, [{dir, "repo/b"}]), ok = apply_cmds(GitCmds, [{dir, "repo/c"}]), |