Adding rt for bug 5

This commit is contained in:
Dave Smith 2010-06-04 12:21:24 -06:00
parent 30ae41dafd
commit 623200ec17
4 changed files with 38 additions and 7 deletions

View file

@ -3,3 +3,4 @@
.~
\.orig
\.swp
rt.work/*

28
inttest/bug_5_rt.erl Normal file
View file

@ -0,0 +1,28 @@
-module(bug_5_rt).
-compile(export_all).
files() ->
[{create, "ebin/a1.app", app(a1)},
{create, "deps/d1/src/d1.app.src", app(d1)},
{create, "rebar.config",
<<"{deps, [{d1, \"1\", {hg, \"http://example.com\", \"tip\"}}]}.\n">>},
{copy, "../rebar", "rebar"}].
run(_Dir) ->
{ok, _} = retest:sh("./rebar compile").
%%
%% Generate the contents of a simple .app file
%%
app(Name) ->
App = {application, Name,
[{description, atom_to_list(Name)},
{vsn, "1"},
{modules, []},
{registered, []},
{applications, [kernel, stdlib]}]},
io_lib:format("~p.\n", [App]).

1
inttest/retest Symbolic link
View file

@ -0,0 +1 @@
/Users/dizzyd/src/public/retest/retest

View file

@ -319,13 +319,14 @@ process_subdirs(Dir, Modules, Config, ModuleSetFile, Command, ProcessedDirs) ->
%% http://bitbucket.org/basho/rebar/issue/5
%% If the compiler ran, run the preprocess again because a new ebin dir
%% may have been produced.
{UpdatedConfig1, _} = case (Dirs =/= [] andalso compile == Command) of
true ->
acc_modules(Modules, preprocess, UpdatedConfig,
ModuleSetFile);
false ->
{UpdatedConfig, Dirs}
end,
%% {UpdatedConfig1, _} = case (Dirs =/= [] andalso compile == Command) of
%% true ->
%% acc_modules(Modules, preprocess, UpdatedConfig,
%% ModuleSetFile);
%% false ->
%% {UpdatedConfig, Dirs}
%% end,
UpdatedConfig1 = UpdatedConfig,
%% Make sure the CWD is reset properly; processing subdirs may have caused it
%% to change