diff options
| author | Micael Karlberg <[email protected]> | 2011-04-15 12:08:38 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-04-15 12:08:38 +0200 |
| commit | f5cb2e252f789ed9fc99f638772b9292a2df7c44 (patch) | |
| tree | 5accea367e85cbe63afa9927c1239ef995daa16c /lib/eunit/src/eunit_lib.erl | |
| parent | bb6e729795ebf3dddfcfd7182384bda59e9f6a94 (diff) | |
| parent | 23906a01725f4494b8816c242926d08aeca0ef67 (diff) | |
| download | otp-f5cb2e252f789ed9fc99f638772b9292a2df7c44.tar.gz otp-f5cb2e252f789ed9fc99f638772b9292a2df7c44.tar.bz2 otp-f5cb2e252f789ed9fc99f638772b9292a2df7c44.zip | |
Merge branch 'dev' into bmk/snmp/snmp420_integration
Diffstat (limited to 'lib/eunit/src/eunit_lib.erl')
| -rw-r--r-- | lib/eunit/src/eunit_lib.erl | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lib/eunit/src/eunit_lib.erl b/lib/eunit/src/eunit_lib.erl index 4751f1094a..45d2387e7b 100644 --- a/lib/eunit/src/eunit_lib.erl +++ b/lib/eunit/src/eunit_lib.erl @@ -33,7 +33,7 @@ -export([dlist_next/1, uniq/1, fun_parent/1, is_string/1, command/1, command/2, command/3, trie_new/0, trie_store/2, trie_match/2, split_node/1, consult_file/1, list_dir/1, format_exit_term/1, - format_exception/1, format_error/1]). + format_exception/1, format_exception/2, format_error/1]). %% Type definitions for describing exceptions @@ -55,21 +55,23 @@ %% --------------------------------------------------------------------- %% Formatting of error descriptors +format_exception(Exception) -> + format_exception(Exception, 20). -format_exception({Class,Term,Trace}) +format_exception({Class,Term,Trace}, Depth) when is_atom(Class), is_list(Trace) -> case is_stacktrace(Trace) of true -> io_lib:format("~w:~P\n~s", - [Class, Term, 20, format_stacktrace(Trace)]); + [Class, Term, Depth, format_stacktrace(Trace)]); false -> - format_term(Term) + format_term(Term, Depth) end; -format_exception(Term) -> - format_term(Term). +format_exception(Term, Depth) -> + format_term(Term, Depth). -format_term(Term) -> - io_lib:format("~P\n", [Term, 15]). +format_term(Term, Depth) -> + io_lib:format("~P\n", [Term, Depth]). format_exit_term(Term) -> {Reason, Trace} = analyze_exit_term(Term), |