diff options
| author | Björn Gustavsson <[email protected]> | 2015-10-30 11:54:40 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-10-30 11:54:40 +0100 |
| commit | 95197d3dd5561908a9fe1081ee9908174fd79517 (patch) | |
| tree | d3ccf22c9115bb01cc6b8d7a30da39ab64dab5f7 /lib/stdlib | |
| parent | 97313076be76f5b0ba8fb573713046fe3ee17516 (diff) | |
| parent | a657f1f5e4d1d520865497fc0421ebd5f43ca70d (diff) | |
| download | otp-95197d3dd5561908a9fe1081ee9908174fd79517.tar.gz otp-95197d3dd5561908a9fe1081ee9908174fd79517.tar.bz2 otp-95197d3dd5561908a9fe1081ee9908174fd79517.zip | |
Merge branch 'bjorn/cuddle-with-tests'
* bjorn/cuddle-with-tests:
epp_SUITE: Avoid hard-coding list of macros more than once
epp_SUITE: Add smoke and coverage test of format_error/1
Diffstat (limited to 'lib/stdlib')
| -rw-r--r-- | lib/stdlib/test/epp_SUITE.erl | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/lib/stdlib/test/epp_SUITE.erl b/lib/stdlib/test/epp_SUITE.erl index 4e5df661b3..199d2f193d 100644 --- a/lib/stdlib/test/epp_SUITE.erl +++ b/lib/stdlib/test/epp_SUITE.erl @@ -826,14 +826,14 @@ otp_8130(Config) when is_list(Config) -> "-define(a, 3.14).\n" "t() -> ?a.\n"), ?line {ok,Epp} = epp:open(File, []), - ?line ['BASE_MODULE','BASE_MODULE_STRING','BEAM','FILE','LINE', - 'MACHINE','MODULE','MODULE_STRING'] = macs(Epp), + PreDefMacs = macs(Epp), + ['BASE_MODULE','BASE_MODULE_STRING','BEAM','FILE','LINE', + 'MACHINE','MODULE','MODULE_STRING'] = PreDefMacs, ?line {ok,[{'-',_},{atom,_,file}|_]} = epp:scan_erl_form(Epp), ?line {ok,[{'-',_},{atom,_,module}|_]} = epp:scan_erl_form(Epp), ?line {ok,[{atom,_,t}|_]} = epp:scan_erl_form(Epp), ?line {eof,_} = epp:scan_erl_form(Epp), - ?line ['BASE_MODULE','BASE_MODULE_STRING','BEAM','FILE','LINE', - 'MACHINE','MODULE','MODULE_STRING',a] = macs(Epp), + [a] = macs(Epp) -- PreDefMacs, ?line epp:close(Epp), %% escript @@ -1528,8 +1528,11 @@ compile_test(Config, Test0) -> warnings(File, Ws) -> case lists:append([W || {F, W} <- Ws, F =:= File]) of - [] -> []; - L -> {warnings, L} + [] -> + []; + L -> + call_format_error(L), + {warnings, L} end. compile_file(File, Opts) -> @@ -1540,12 +1543,20 @@ compile_file(File, Opts) -> end. errs([{File,Es}|L], File) -> + call_format_error(Es), Es ++ errs(L, File); errs([_|L], File) -> errs(L, File); errs([], _File) -> []. +%% Smoke test and coverage of format_error/1. +call_format_error([{_,M,E}|T]) -> + _ = M:format_error(E), + call_format_error(T); +call_format_error([]) -> + ok. + epp_parse_file(File, Opts) -> case epp:parse_file(File, Opts) of {ok, Forms} -> |