mirror of
https://github.com/correl/rebar.git
synced 2024-11-27 11:09:55 +00:00
Fix is_verbose/1 helper function
This commit is contained in:
parent
f39309a660
commit
277a10cd3b
6 changed files with 29 additions and 23 deletions
|
@ -258,20 +258,27 @@ save_options(Config, {Options, NonOptArgs}) ->
|
||||||
%% set log level based on getopt option
|
%% set log level based on getopt option
|
||||||
%%
|
%%
|
||||||
set_log_level(Config, Options) ->
|
set_log_level(Config, Options) ->
|
||||||
Level = case proplists:get_bool(quiet, Options) of
|
{IsVerbose, Level} =
|
||||||
|
case proplists:get_bool(quiet, Options) of
|
||||||
true ->
|
true ->
|
||||||
rebar_log:error_level();
|
{false, rebar_log:error_level()};
|
||||||
false ->
|
false ->
|
||||||
DefaultLevel = rebar_log:default_level(),
|
DefaultLevel = rebar_log:default_level(),
|
||||||
case proplists:get_all_values(verbose, Options) of
|
case proplists:get_all_values(verbose, Options) of
|
||||||
[] ->
|
[] ->
|
||||||
DefaultLevel;
|
{false, DefaultLevel};
|
||||||
Verbosities ->
|
Verbosities ->
|
||||||
DefaultLevel + lists:last(Verbosities)
|
{true, DefaultLevel + lists:last(Verbosities)}
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
|
|
||||||
rebar_config:set_global(Config, verbose, Level).
|
case IsVerbose of
|
||||||
|
true ->
|
||||||
|
Config1 = rebar_config:set_xconf(Config, is_verbose, true),
|
||||||
|
rebar_config:set_global(Config1, verbose, Level);
|
||||||
|
false ->
|
||||||
|
rebar_config:set_global(Config, verbose, Level)
|
||||||
|
end.
|
||||||
|
|
||||||
%%
|
%%
|
||||||
%% show version information and halt
|
%% show version information and halt
|
||||||
|
|
|
@ -31,7 +31,6 @@
|
||||||
get_all/2,
|
get_all/2,
|
||||||
set/3,
|
set/3,
|
||||||
set_global/3, get_global/3,
|
set_global/3, get_global/3,
|
||||||
is_verbose/1,
|
|
||||||
save_env/3, get_env/2, reset_envs/1,
|
save_env/3, get_env/2, reset_envs/1,
|
||||||
set_skip_dir/2, is_skip_dir/2, reset_skip_dirs/1,
|
set_skip_dir/2, is_skip_dir/2, reset_skip_dirs/1,
|
||||||
clean_config/2,
|
clean_config/2,
|
||||||
|
@ -110,10 +109,6 @@ get_global(Config, Key, Default) ->
|
||||||
Value
|
Value
|
||||||
end.
|
end.
|
||||||
|
|
||||||
is_verbose(Config) ->
|
|
||||||
DefaultLevel = rebar_log:default_level(),
|
|
||||||
get_global(Config, verbose, DefaultLevel) > DefaultLevel.
|
|
||||||
|
|
||||||
consult_file(File) ->
|
consult_file(File) ->
|
||||||
case filename:extension(File) of
|
case filename:extension(File) of
|
||||||
".script" ->
|
".script" ->
|
||||||
|
|
|
@ -101,7 +101,7 @@ run_test(TestDir, LogDir, Config, _File) ->
|
||||||
{Cmd, RawLog} = make_cmd(TestDir, LogDir, Config),
|
{Cmd, RawLog} = make_cmd(TestDir, LogDir, Config),
|
||||||
?DEBUG("ct_run cmd:~n~p~n", [Cmd]),
|
?DEBUG("ct_run cmd:~n~p~n", [Cmd]),
|
||||||
clear_log(LogDir, RawLog),
|
clear_log(LogDir, RawLog),
|
||||||
Output = case rebar_config:is_verbose(Config) of
|
Output = case rebar_log:is_verbose(Config) of
|
||||||
false ->
|
false ->
|
||||||
" >> " ++ RawLog ++ " 2>&1";
|
" >> " ++ RawLog ++ " 2>&1";
|
||||||
true ->
|
true ->
|
||||||
|
@ -172,7 +172,7 @@ check_log(Config,RawLog,Fun) ->
|
||||||
%% Show the log if it hasn't already been shown because verbose was on
|
%% Show the log if it hasn't already been shown because verbose was on
|
||||||
show_log(Config, RawLog) ->
|
show_log(Config, RawLog) ->
|
||||||
?CONSOLE("Showing log\n", []),
|
?CONSOLE("Showing log\n", []),
|
||||||
case rebar_config:is_verbose(Config) of
|
case rebar_log:is_verbose(Config) of
|
||||||
false ->
|
false ->
|
||||||
{ok, Contents} = file:read_file(RawLog),
|
{ok, Contents} = file:read_file(RawLog),
|
||||||
?CONSOLE("~s", [Contents]);
|
?CONSOLE("~s", [Contents]);
|
||||||
|
|
|
@ -408,7 +408,7 @@ perform_eunit(Config, Tests) ->
|
||||||
|
|
||||||
get_eunit_opts(Config) ->
|
get_eunit_opts(Config) ->
|
||||||
%% Enable verbose in eunit if so requested..
|
%% Enable verbose in eunit if so requested..
|
||||||
BaseOpts = case rebar_config:is_verbose(Config) of
|
BaseOpts = case rebar_log:is_verbose(Config) of
|
||||||
true ->
|
true ->
|
||||||
[verbose];
|
[verbose];
|
||||||
false ->
|
false ->
|
||||||
|
|
|
@ -31,7 +31,8 @@
|
||||||
error_level/0,
|
error_level/0,
|
||||||
default_level/0,
|
default_level/0,
|
||||||
log/3,
|
log/3,
|
||||||
log/4]).
|
log/4,
|
||||||
|
is_verbose/1]).
|
||||||
|
|
||||||
-define(ERROR_LEVEL, 0).
|
-define(ERROR_LEVEL, 0).
|
||||||
-define(WARN_LEVEL, 1).
|
-define(WARN_LEVEL, 1).
|
||||||
|
@ -69,6 +70,9 @@ log(Device, Level, Str, Args) ->
|
||||||
error_level() -> ?ERROR_LEVEL.
|
error_level() -> ?ERROR_LEVEL.
|
||||||
default_level() -> ?WARN_LEVEL.
|
default_level() -> ?WARN_LEVEL.
|
||||||
|
|
||||||
|
is_verbose(Config) ->
|
||||||
|
rebar_config:get_xconf(Config, is_verbose, false).
|
||||||
|
|
||||||
%% ===================================================================
|
%% ===================================================================
|
||||||
%% Internal functions
|
%% Internal functions
|
||||||
%% ===================================================================
|
%% ===================================================================
|
||||||
|
|
|
@ -51,7 +51,7 @@ xref(Config, _) ->
|
||||||
|
|
||||||
xref:set_default(xref, [{warnings,
|
xref:set_default(xref, [{warnings,
|
||||||
rebar_config:get(Config, xref_warnings, false)},
|
rebar_config:get(Config, xref_warnings, false)},
|
||||||
{verbose, rebar_config:is_verbose(Config)}]),
|
{verbose, rebar_log:is_verbose(Config)}]),
|
||||||
|
|
||||||
{ok, _} = xref:add_directory(xref, "ebin"),
|
{ok, _} = xref:add_directory(xref, "ebin"),
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue