github/rebar
1
0
Fork 0
mirror of https://github.com/correl/rebar.git synced 2024-11-24 03:00:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

rebar_ct: fix Dialyzer warning caused by bcc57e9b

Browse source 
Also fix a single line exceeding max column.
This commit is contained in:
Tuncer Ayaz 2013-06-15 10:54:29 +02:00
parent ec1f503946
commit edd835510b
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/rebar_ct.erl
View file

@ -108,7 +108,8 @@ run_test(TestDir, LogDir, Config, _File) ->
" 2>&1 | tee -a " ++ RawLog " 2>&1 | tee -a " ++ RawLog
end, end,
case rebar_utils:sh(Cmd ++ Output, [{env,[{"TESTDIR", TestDir}]}, return_on_error]) of ShOpts = [{env,[{"TESTDIR", TestDir}]}, return_on_error],
case rebar_utils:sh(Cmd ++ Output, ShOpts) of
{ok,_} -> {ok,_} ->
%% in older versions of ct_run, this could have been a failure %% in older versions of ct_run, this could have been a failure
%% that returned a non-0 code. Check for that! %% that returned a non-0 code. Check for that!
@ -135,11 +136,16 @@ clear_log(LogDir, RawLog) ->
check_success_log(Config, RawLog) -> check_success_log(Config, RawLog) ->
check_log(Config, RawLog, fun(Msg) -> ?CONSOLE("DONE.\n~s\n", [Msg]) end). check_log(Config, RawLog, fun(Msg) -> ?CONSOLE("DONE.\n~s\n", [Msg]) end).
check_fail_log(Config, RawLog, Command, {Rc, Output}) -> -type err_handler() :: fun((string()) -> no_return()).
check_log(Config, RawLog, fun(_Msg) -> -spec failure_logger(string(), {integer(), string()}) -> err_handler().
failure_logger(Command, {Rc, Output}) ->
fun(_Msg) ->
?ABORT("~s failed with error: ~w and output:~n~s~n", ?ABORT("~s failed with error: ~w and output:~n~s~n",
[Command, Rc, Output]) [Command, Rc, Output])
end). end.
check_fail_log(Config, RawLog, Command, Result) ->
check_log(Config, RawLog, failure_logger(Command, Result)).
check_log(Config,RawLog,Fun) -> check_log(Config,RawLog,Fun) ->
{ok, Msg} = {ok, Msg} =