Remove unnecessary debug in _core; adding EQC flag for eunit builds

This commit is contained in:
Dave Smith 2009-12-08 15:52:53 -07:00
parent ffa0cda467
commit b088139ed0
2 changed files with 24 additions and 3 deletions

View file

@ -43,7 +43,6 @@ run(["version"]) ->
?CONSOLE("Version ~s built ~s\n", [Vsn, ?BUILD_TIME]),
ok;
run(Args) ->
?CONSOLE("Args: ~p\n", [Args]),
%% Filter all the flags (i.e. string of form key=value) from the
%% command line arguments. What's left will be the commands to run.
Commands = filter_flags(Args, []),

View file

@ -91,9 +91,17 @@ clean(Config, File) ->
%% ===================================================================
compile_erl(Source, Config) ->
case is_quickcheck_avail() of
true ->
EqcOpts = [{d, 'EQC'}];
false ->
EqcOpts = []
end,
ErlOpts = rebar_config:get_list(Config, erl_opts, []),
EunitOpts = rebar_config:get_list(Config, eunit_compile_opts, []),
Opts = [{i, "include"}, {outdir, ?EUNIT_DIR}, {d, 'TEST'}, debug_info, report] ++ ErlOpts ++ EunitOpts,
Opts = [{i, "include"}, {outdir, ?EUNIT_DIR}, {d, 'TEST'}, debug_info, report] ++
ErlOpts ++ EunitOpts ++ EqcOpts,
case compile:file(Source, Opts) of
{ok, _} ->
ok;
@ -101,6 +109,20 @@ compile_erl(Source, Config) ->
?FAIL
end.
is_quickcheck_avail() ->
case erlang:get(is_quickcheck_avail) of
undefined ->
case code:lib_dir(eqc, include) of
{error, bad_name} ->
IsAvail = false;
Dir ->
IsAvail = filelib:is_file(filename:join(Dir, "eqc.hrl"))
end,
erlang:put(is_quickcheck_avail, IsAvail),
?DEBUG("Quickcheck availability: ~p\n", [IsAvail]),
IsAvail;
IsAvail ->
IsAvail
end.