aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2019-02-21 10:40:27 +0100
committerSiri Hansen <[email protected]>2019-02-21 10:40:27 +0100
commit1ebe4074d58068b8187bbe713a76875a406ddda9 (patch)
tree47affc6ab99362a26f103e1f8d9ac82ef5fb570b /lib/kernel
parente0bdf582303be57a2f1a1bf7abe27af102d03c09 (diff)
parent21801003718dd0ca06d5171eb2b4a00790a00d40 (diff)
downloadotp-1ebe4074d58068b8187bbe713a76875a406ddda9.tar.gz
otp-1ebe4074d58068b8187bbe713a76875a406ddda9.tar.bz2
otp-1ebe4074d58068b8187bbe713a76875a406ddda9.zip
Merge branch 'siri/cuddle-master'
* siri/cuddle-master: Update sasl/test/test_lib.hrl with recent versions of kernel and stdlib [logger] Fix faulty report_cb in logger_disk_log_h_SUITE:logging/1 [cdv] Update compiler directive for release compatibility [reltool] Make test pass when $ERL_LIBS is set
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/test/logger_disk_log_h_SUITE.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/test/logger_disk_log_h_SUITE.erl b/lib/kernel/test/logger_disk_log_h_SUITE.erl
index 9bbec42de8..13b30835a1 100644
--- a/lib/kernel/test/logger_disk_log_h_SUITE.erl
+++ b/lib/kernel/test/logger_disk_log_h_SUITE.erl
@@ -293,7 +293,7 @@ logging(Config) ->
ok = start_and_add(Name, #{filter_default=>log,
formatter=>{?MODULE,self()}},
#{file => LogFile}),
- MsgFormatter = fun(Term) -> {io_lib:format("Term:~p",[Term]),[]} end,
+ MsgFormatter = fun(Term) -> {"Term:~p",[Term]} end,
logger:notice([{x,y}], #{report_cb => MsgFormatter}),
logger:notice([{x,y}], #{}),
ct:pal("Checking contents of ~p", [?log_no(LogFile,1)]),