[logger] Remove some compiler warnings in test suites

4 files changed, 32 insertions, 29 deletions

diff --git a/lib/kernel/test/logger_env_var_SUITE.erl b/lib/kernel/test/logger_env_var_SUITE.erl
index 6e182d4bca..3a8560bbf5 100644
--- a/lib/kernel/test/logger_env_var_SUITE.erl
+++ b/lib/kernel/test/logger_env_var_SUITE.erl
@@ -214,6 +214,7 @@ logger_file(Config) ->
                       file,% dest
                       0),% progress in std logger
 
+    notice = maps:get(level,P),
     #{module:=logger_std_h} = StdC = find(?STANDARD_HANDLER,Hs),
     all = maps:get(level,StdC),
     StdFilters = maps:get(filters,StdC),
@@ -525,7 +526,7 @@ logger_many_handlers_default_last_broken_filter(Config) ->
               {logger_level,info}], LogErr, LogInfo, 7).
 
 logger_many_handlers(Config, Env, LogErr, LogInfo, NumProgress) ->
-    {ok,#{handlers:=Hs},Node} = setup(Config,Env),
+    {ok,_,Node} = setup(Config,Env),
     check_single_log(Node,LogErr,
                      file,% dest
                      0,% progress in std logger
diff --git a/lib/kernel/test/logger_legacy_SUITE.erl b/lib/kernel/test/logger_legacy_SUITE.erl
index de73b6152a..a0d133b7e9 100644
--- a/lib/kernel/test/logger_legacy_SUITE.erl
+++ b/lib/kernel/test/logger_legacy_SUITE.erl
@@ -20,6 +20,8 @@
 -module(logger_legacy_SUITE).
 
 -compile(export_all).
+-compile({nowarn_deprecated_function,[{gen_fsm,start,3},
+                                      {gen_fsm,send_all_state_event,2}]}).
 
 -include_lib("common_test/include/ct.hrl").
 -include_lib("kernel/include/logger.hrl").
@@ -122,7 +124,7 @@ all() ->
 
 gen_server(_Config) ->
     {ok,Pid} = gen_server:start(?MODULE,gen_server,[]),
-    Msg = fun() -> a=b end,
+    Msg = fun() -> erlang:error({badmatch,b}) end,
     Pid ! Msg,
     ?check({warning_msg,"** Undefined handle_info in ~p"++_,[?MODULE,Msg]}),
     ok = gen_server:cast(Pid,Msg),
@@ -132,7 +134,7 @@ gen_server(_Config) ->
 gen_event(_Config) ->
     {ok,Pid} = gen_event:start(),
     ok = gen_event:add_handler(Pid,?MODULE,gen_event),
-    Msg = fun() -> a=b end,
+    Msg = fun() -> erlang:error({badmatch,b}) end,
     Pid ! Msg,
     ?check({warning_msg,"** Undefined handle_info in ~tp"++_,[?MODULE,Msg]}),
     gen_event:notify(Pid,Msg),
@@ -141,7 +143,7 @@ gen_event(_Config) ->
 
 gen_fsm(_Config) ->
     {ok,Pid} = gen_fsm:start(?MODULE,gen_fsm,[]),
-    Msg = fun() -> a=b end,
+    Msg = fun() -> erlang:error({badmatch,b}) end,
     Pid ! Msg,
     ?check({warning_msg,"** Undefined handle_info in ~p"++_,[?MODULE,Msg]}),
     gen_fsm:send_all_state_event(Pid,Msg),
@@ -150,7 +152,7 @@ gen_fsm(_Config) ->
 
 gen_statem(_Config) ->
     {ok,Pid} = gen_statem:start(?MODULE,gen_statem,[]),
-    Msg = fun() -> a=b end,
+    Msg = fun() -> erlang:error({badmatch,b}) end,
     Pid ! Msg,
     ?check({error,"** State machine ~tp terminating"++_,
             [Pid,{info,Msg},{mystate,gen_statem},error,{badmatch,b}|_]}).
@@ -179,7 +181,7 @@ sasl_reports(Config) ->
     ok = gen_server:cast(ChPid, fun() ->
                                         spawn_link(fun() -> receive x->ok end end)
                                 end),
-    Msg = fun() -> a=b end,
+    Msg = fun() -> erlang:error({badmatch,b}) end,
     ok = gen_server:cast(ChPid,Msg),
     ?check_no_flush({error,"** Generic server ~tp terminating"++_,
                      [ChPid,{'$gen_cast',Msg},gen_server,{{badmatch,b},_}]}),
diff --git a/lib/kernel/test/logger_simple_h_SUITE.erl b/lib/kernel/test/logger_simple_h_SUITE.erl
index e4e48b538a..79e5c057ad 100644
--- a/lib/kernel/test/logger_simple_h_SUITE.erl
+++ b/lib/kernel/test/logger_simple_h_SUITE.erl
@@ -107,15 +107,15 @@ start_stop(cleanup,_Config) ->
 replace_default(Config) ->
 
     {ok, _, Node} = logger_test_lib:setup(Config, [{logger, [{handler, default, undefined}]}]),
-    log(Node, emergency, [M1=?str]),
-    log(Node, alert, [M2=?str,[]]),
-    log(Node, error, [M3=?map_rep]),
-    log(Node, info, [M4=?keyval_rep]),
-    log(Node, info, [M41=?keyval_rep++[not_key_val]]),
-    rpc:call(Node, error_logger, error_report, [some_type,M5=?map_rep]),
-    rpc:call(Node, error_logger, warning_report, ["some_type",M6=?map_rep]),
-    log(Node, critical, [M7=?str,[A7=?keyval_rep]]),
-    log(Node, notice, [M8=["fake",string,"line:",?LINE]]),
+    log(Node, emergency, [?str]),
+    log(Node, alert, [?str,[]]),
+    log(Node, error, [?map_rep]),
+    log(Node, info, [?keyval_rep]),
+    log(Node, info, [?keyval_rep++[not_key_val]]),
+    rpc:call(Node, error_logger, error_report, [some_type,?map_rep]),
+    rpc:call(Node, error_logger, warning_report, ["some_type",?map_rep]),
+    log(Node, critical, [?str,[?keyval_rep]]),
+    log(Node, notice, [["fake",string,"line:",?LINE]]),
 
     Env = rpc:call(Node, application, get_env, [kernel, logger, []]),
     ok = rpc:call(Node, logger, add_handlers, [Env]),
@@ -127,11 +127,11 @@ replace_file(Config) ->
     {ok, _, Node} = logger_test_lib:setup(Config, [{logger, [{handler, default, undefined}]}]),
     log(Node, emergency, [M1=?str]),
     log(Node, alert, [M2=?str,[]]),
-    log(Node, error, [M3=?map_rep]),
-    log(Node, warning, [M4=?keyval_rep]),
-    log(Node, warning, [M41=?keyval_rep++[not_key_val]]),
-    log(Node, critical, [M7=?str,[A7=?keyval_rep]]),
-    log(Node, notice, [M8=["fake",string,"line:",?LINE]]),
+    log(Node, error, [?map_rep]),
+    log(Node, warning, [?keyval_rep]),
+    log(Node, warning, [?keyval_rep++[not_key_val]]),
+    log(Node, critical, [?str,[?keyval_rep]]),
+    log(Node, notice, [["fake",string,"line:",?LINE]]),
 
     File = filename:join(proplists:get_value(priv_dir,Config),
                          atom_to_list(?FUNCTION_NAME)++".log"),
@@ -171,11 +171,11 @@ replace_disk_log(Config) ->
     {ok, _, Node} = logger_test_lib:setup(Config, [{logger, [{handler, default, undefined}]}]),
     log(Node, emergency, [M1=?str]),
     log(Node, alert, [M2=?str,[]]),
-    log(Node, error, [M3=?map_rep]),
-    log(Node, warning, [M4=?keyval_rep]),
-    log(Node, warning, [M41=?keyval_rep++[not_key_val]]),
-    log(Node, critical, [M7=?str,[A7=?keyval_rep]]),
-    log(Node, notice, [M8=["fake",string,"line:",?LINE]]),
+    log(Node, error, [?map_rep]),
+    log(Node, warning, [?keyval_rep]),
+    log(Node, warning, [?keyval_rep++[not_key_val]]),
+    log(Node, critical, [?str,[?keyval_rep]]),
+    log(Node, notice, [["fake",string,"line:",?LINE]]),
 
     File = filename:join(proplists:get_value(priv_dir,Config),
                          atom_to_list(?FUNCTION_NAME)++".log"),
diff --git a/lib/kernel/test/logger_std_h_SUITE.erl b/lib/kernel/test/logger_std_h_SUITE.erl
index 27b1cfc5ea..0bdd7fa00e 100644
--- a/lib/kernel/test/logger_std_h_SUITE.erl
+++ b/lib/kernel/test/logger_std_h_SUITE.erl
@@ -695,10 +695,10 @@ start_std_h_on_new_node(Config, Log) ->
     Node.
 
 %% functions for test hook macros to be called by rpc
-set_internal_log(Mod, Func) ->
-    ?set_internal_log({Mod,Func}).
-set_result(Op, Result) ->
-    ?set_result(Op, Result).
+set_internal_log(_Mod, _Func) ->
+    ?set_internal_log({_Mod,_Func}).
+set_result(_Op, _Result) ->
+    ?set_result(_Op, _Result).
 set_defaults() ->
     ?set_defaults().