diff options
| -rw-r--r-- | inttest/bug_5_rt.erl | 3 | ||||
| -rw-r--r-- | inttest/tdeps1/a.erl | 5 | ||||
| -rw-r--r-- | inttest/tdeps1/tdeps1_rt.erl | 16 |
3 files changed, 16 insertions, 8 deletions
diff --git a/inttest/bug_5_rt.erl b/inttest/bug_5_rt.erl index 9f9711d..a06b693 100644 --- a/inttest/bug_5_rt.erl +++ b/inttest/bug_5_rt.erl @@ -11,7 +11,8 @@ files() -> {copy, "../rebar", "rebar"}]. run(_Dir) -> - {ok, _} = retest:sh("./rebar compile"). + {ok, _} = retest:sh("./rebar compile"), + ok. diff --git a/inttest/tdeps1/a.erl b/inttest/tdeps1/a.erl index 5236b89..e64b16d 100644 --- a/inttest/tdeps1/a.erl +++ b/inttest/tdeps1/a.erl @@ -1,4 +1,9 @@ -module(a). +-compile(export_all). + -include_lib("b/include/b.hrl"). +hello() -> + io:format("~s\n", [?HELLO]). + diff --git a/inttest/tdeps1/tdeps1_rt.erl b/inttest/tdeps1/tdeps1_rt.erl index 5b531bc..5eb831d 100644 --- a/inttest/tdeps1/tdeps1_rt.erl +++ b/inttest/tdeps1/tdeps1_rt.erl @@ -8,22 +8,22 @@ files() -> [ %% A application - {create, "ebin/a.app", app(a)}, + {create, "ebin/a.app", app(a, [a])}, {copy, "a.rebar.config", "rebar.config"}, {copy, "a.erl", "src/a.erl"}, {copy, "../../rebar", "rebar"}, %% B application - {create, "repo/b/src/b.app.src", app(b)}, + {create, "repo/b/ebin/b.app", app(b, [])}, {copy, "b.rebar.config", "repo/b/rebar.config"}, {copy, "b.hrl", "repo/b/include/b.hrl"}, %% C application - {create, "repo/c/ebin/c.app", app(c)}, + {create, "repo/c/ebin/c.app", app(c, [])}, {copy, "c.hrl", "repo/c/include/c.hrl"} ]. -run(_Dir) -> +run(Dir) -> %% Initialize the b/c apps as mercurial repos so that dependencies pull %% properly HgCmd = "/bin/sh -c \"hg init && hg add && hg commit -m 'Initial commit'\"", @@ -31,7 +31,9 @@ run(_Dir) -> {ok, _} = retest_sh:run(HgCmd, [{dir, "repo/c"}]), - {ok, _} = retest_sh:run("./rebar -v get-deps compile", []), + {ok, _} = retest_sh:run("./rebar get-deps compile", []), + + true = filelib:is_file("ebin/a.beam"), ok. @@ -39,11 +41,11 @@ run(_Dir) -> %% %% Generate the contents of a simple .app file %% -app(Name) -> +app(Name, Modules) -> App = {application, Name, [{description, atom_to_list(Name)}, {vsn, "1"}, - {modules, []}, + {modules, Modules}, {registered, []}, {applications, [kernel, stdlib]}]}, io_lib:format("~p.\n", [App]). |