diff options
| author | Siri Hansen <[email protected]> | 2017-10-23 13:53:27 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2017-10-23 13:53:27 +0200 |
| commit | 541ee20b9eaefed7802f08cecddfbd12e5f3b516 (patch) | |
| tree | 90ee11367e07c483a6c8d95db410f3175ec6b151 /lib | |
| parent | fcbace8f04c741652820d9f91c6de7b49c92c1d9 (diff) | |
| parent | 6c92cd8360fcacd85a8edd1cdb3fbfa307a1743f (diff) | |
| download | otp-541ee20b9eaefed7802f08cecddfbd12e5f3b516.tar.gz otp-541ee20b9eaefed7802f08cecddfbd12e5f3b516.tar.bz2 otp-541ee20b9eaefed7802f08cecddfbd12e5f3b516.zip | |
Merge branch 'siri/rb/fix-bad_form/ERL-261/OTP-13906' into maint
* siri/rb/fix-bad_form/ERL-261/OTP-13906:
[rb] Don't fail for unexpected type of report
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sasl/src/format_lib_supp.erl | 6 | ||||
| -rw-r--r-- | lib/sasl/test/rb_SUITE.erl | 18 |
2 files changed, 22 insertions, 2 deletions
diff --git a/lib/sasl/src/format_lib_supp.erl b/lib/sasl/src/format_lib_supp.erl index 80dcdc91da..00ce1b4e33 100644 --- a/lib/sasl/src/format_lib_supp.erl +++ b/lib/sasl/src/format_lib_supp.erl @@ -86,8 +86,10 @@ print_data(Device, Line, [{Key, Value}|T]) -> print_data(Device, Line, [Value|T]) -> Modifier = misc_supp:modifier(Device), io:format(Device, "~"++Modifier++"p~n", [Value]), - print_data(Device, Line, T). - + print_data(Device, Line, T); +print_data(Device, _Line, Value) -> + Modifier = misc_supp:modifier(Device), + io:format(Device, "~"++Modifier++"p~n", [Value]). print_items(Device, Line, {Name, Items}) -> print_items(Device, Line, Name, Items). diff --git a/lib/sasl/test/rb_SUITE.erl b/lib/sasl/test/rb_SUITE.erl index 426dedbab5..4ba2540545 100644 --- a/lib/sasl/test/rb_SUITE.erl +++ b/lib/sasl/test/rb_SUITE.erl @@ -36,6 +36,7 @@ no_group_cases() -> groups() -> [{running_error_logger,[shuffle],[show, + show_other, list, rescan, start_stop_log, @@ -165,6 +166,23 @@ show(Config) -> ok. +show_other(Config) -> + PrivDir = ?config(priv_dir,Config), + OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"), + + %% Insert some reports in the error log and start rb + error_logger:info_report([rb_test_term_in_list]), + error_logger:info_report(rb_test_term_no_list), + ok = start_rb(OutFile), + + %% Show by type and check content + [{_,I1},{_,I2}] = check_report(fun() -> rb:show(info_report) end,OutFile), + + true = contains(I1,"rb_test_term_no_list"), + true = contains(I2,"rb_test_term_in_list"), + + ok. + list(Config) -> PrivDir = ?config(priv_dir,Config), OutFile = filename:join(PrivDir,"rb_SUITE_log.txt"), |