aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel/test
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2018-12-21 12:35:39 +0100
committerSiri Hansen <[email protected]>2019-01-16 09:59:24 +0100
commit06b9756aceb200c359015a088f86e8afc097dc97 (patch)
treed23e63c028eba91ff04bc274fd1ee3aa0fdb23b1 /lib/kernel/test
parent4ec6d337da40599b5153c7878d329ca1045b6a35 (diff)
downloadotp-06b9756aceb200c359015a088f86e8afc097dc97.tar.gz
otp-06b9756aceb200c359015a088f86e8afc097dc97.tar.bz2
otp-06b9756aceb200c359015a088f86e8afc097dc97.zip
[logger] Move out overload protection macros from logger_h_common.hrl
The new file logger_olp.hrl is added.
Diffstat (limited to 'lib/kernel/test')
-rw-r--r--lib/kernel/test/logger_disk_log_h_SUITE.erl1
-rw-r--r--lib/kernel/test/logger_olp_SUITE.erl2
-rw-r--r--lib/kernel/test/logger_std_h_SUITE.erl12
3 files changed, 12 insertions, 3 deletions
diff --git a/lib/kernel/test/logger_disk_log_h_SUITE.erl b/lib/kernel/test/logger_disk_log_h_SUITE.erl
index 2b7b48bec0..ad342b5ef0 100644
--- a/lib/kernel/test/logger_disk_log_h_SUITE.erl
+++ b/lib/kernel/test/logger_disk_log_h_SUITE.erl
@@ -24,6 +24,7 @@
-include_lib("common_test/include/ct.hrl").
-include_lib("kernel/include/logger.hrl").
-include_lib("kernel/src/logger_internal.hrl").
+-include_lib("kernel/src/logger_olp.hrl").
-include_lib("kernel/src/logger_h_common.hrl").
-include_lib("stdlib/include/ms_transform.hrl").
-include_lib("kernel/include/file.hrl").
diff --git a/lib/kernel/test/logger_olp_SUITE.erl b/lib/kernel/test/logger_olp_SUITE.erl
index 8d08996755..8ba66e5a03 100644
--- a/lib/kernel/test/logger_olp_SUITE.erl
+++ b/lib/kernel/test/logger_olp_SUITE.erl
@@ -21,7 +21,7 @@
-compile(export_all).
--include_lib("kernel/src/logger_h_common.hrl").
+-include_lib("kernel/src/logger_olp.hrl").
suite() ->
[{timetrap,{seconds,30}}].
diff --git a/lib/kernel/test/logger_std_h_SUITE.erl b/lib/kernel/test/logger_std_h_SUITE.erl
index b6ff87d058..25dcc20496 100644
--- a/lib/kernel/test/logger_std_h_SUITE.erl
+++ b/lib/kernel/test/logger_std_h_SUITE.erl
@@ -25,10 +25,15 @@
-include_lib("kernel/include/logger.hrl").
-include_lib("kernel/src/logger_internal.hrl").
-include_lib("kernel/src/logger_h_common.hrl").
+-include_lib("kernel/src/logger_olp.hrl").
-include_lib("stdlib/include/ms_transform.hrl").
-include_lib("kernel/include/file.hrl").
--define(check_no_log, [] = test_server:messages_get()).
+-define(check_no_log,
+ begin
+ timer:sleep(?IDLE_DETECT_TIME*2),
+ [] = test_server:messages_get()
+ end).
-define(check(Expected),
receive
{log,Expected} ->
@@ -420,10 +425,13 @@ crash_std_h(Config,Func,Var,Type,Log) ->
%% logger would send the log event to the logger process here instead
%% of logging it itself.
log_on_remote_node(Node,Msg) ->
+ Pid = self(),
_ = spawn_link(Node,
fun() -> erlang:group_leader(whereis(user),self()),
- logger:notice(Msg)
+ logger:notice(Msg),
+ Pid ! done
end),
+ receive done -> ok end,
ok.